resolved conflicts for merge of 0f99bb3d to klp-modular-dev-plus-aosp

Change-Id: I9be144d41d8ad3c4792f5ca2a3b8aaa65a77530f

diff --cc CleanSpec.mk
index ab2625e,ec1faf1..33ea9c3
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -229,11 -220,9 +229,14 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  # Adding dalvik.vm.dex2oat-flags to eng builds
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 +# 4.4.4 (KKWT)
 +$(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
  # ************************************************