resolved conflicts for merge of 3f72af13 to master

Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c

diff --cc CleanSpec.mk
index b12200e,7b028ec..44cb05e
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -71,26 -71,13 +71,29 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
  $(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/lib/*.so)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/*.so)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/*.so)
 +$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/iself)
 +$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/lsd)
 +$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/apriori)
 +$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/isprelinked)
 +$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/soslim)
 +
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.so)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/*.so)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/*.so)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
  $(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)/system/app/YouTube*)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/librtp_jni_intermediates)
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
  # ************************************************

diff --cc core/version_defaults.mk
Simple merge