resolve merge conflicts of 177c610e7f to cw-e-dev

Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda

diff --cc tools/releasetools/ota_from_target_files.py
index 2f8f0f0,17b56da..d50f086
--- 1/tools/releasetools/ota_from_target_files.py
--- 2/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@@ -1160,7 -1167,7 +1176,8 @@@ def WriteIncrementalOTAPackage(target_z
    if oem_props is not None and len(oem_props) > 0:
      if OPTIONS.oem_source is None:
        raise common.ExternalError("OEM source required for this build")
--    script.Mount("/oem", recovery_mount_options)
++    if not OPTIONS.oem_no_mount:
++      script.Mount("/oem", recovery_mount_options)
      oem_dict = common.LoadDictionaryFromLines(
          open(OPTIONS.oem_source).readlines())
  
@@@ -1537,10 -1565,11 +1575,13 @@@ def main(argv)
        OPTIONS.wipe_user_data = True
      elif o in ("-n", "--no_prereq"):
        OPTIONS.omit_prereq = True
+     elif o == "--downgrade":
+       OPTIONS.downgrade = True
+       OPTIONS.wipe_user_data = True
      elif o in ("-o", "--oem_settings"):
        OPTIONS.oem_source = a
 +    elif o == "--oem_no_mount":
 +      OPTIONS.oem_no_mount = True
      elif o in ("-e", "--extra_script"):
        OPTIONS.extra_script = a
      elif o in ("-a", "--aslr_mode"):