Merge commit 'ec4caba7' into manualmerge

Conflicts:
	CleanSpec.mk

Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a

diff --cc CleanSpec.mk
index 7f97a80,998be2a..043fd8a
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -152,11 -152,12 +152,17 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 +# Start of "K" 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/*)
 +
+ # GCC 4.7
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o)
+ 
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
  # ************************************************

diff --cc core/combo/TARGET_linux-arm.mk
Simple merge