resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp

Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9

diff --cc CleanSpec.mk
index 3fc4ad2,ff05194..5a8ad58
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -211,13 -211,11 +211,18 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  # 4.4.2
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 +# "L" and beyond.
 +# Make libart the default runtime
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +
 +# Rename persist.sys.dalvik.vm.lib to allow new default
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +
+ # KKWT 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/*)
+ 
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
  # ************************************************