resolved conflicts for merge of 8af7e8ed to master

Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122

diff --cc CleanSpec.mk
index f8d0e6f,92e02a1..c0657e7
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -229,16 -223,9 +229,19 @@@ $(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)
+ 
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
  # ************************************************

diff --cc core/Makefile
Simple merge

diff --cc core/config.mk
Simple merge

diff --cc core/envsetup.mk
Simple merge