am 06db7324: resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp

* commit '06db73241a12a6b5f352647e966d254ae6443f68':
  Remove hardcoded TARGET_PREFER_32_BIT_APPS.

diff --cc CleanSpec.mk
index 46e652b,33ea9c3..126d30b
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -229,26 -223,20 +229,29 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
  
 +# L development
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 +
 +# L development
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 +
  # Add ro.product.cpu.abilist{32,64} to build.prop.
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 -# Adding dalvik.vm.dex2oat-flags to eng builds
 +# Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets.
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 -# 4.4.4 (KKWT)
 +# Adding dalvik.vm.dex2oat-flags to eng builds
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
  
+ # Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets.
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+ 
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
  # ************************************************