am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files...

* commit '8ea83e902d931591af37e747763e768e7a6990be':
  Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."

diff --cc core/Makefile
index a8a7d97,298eef1..fca06fa
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -1260,9 -1260,8 +1260,8 @@@ endi
  ifdef PRODUCT_EXTRA_RECOVERY_KEYS
        $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt
  endif
 -      $(hide) echo "mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)" >> $(zip_root)/META/misc_info.txt
 +      $(hide) echo 'mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)' >> $(zip_root)/META/misc_info.txt
        $(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
-       $(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
        $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)
        @# Zip everything up, preserving symlinks
        $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)