resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp

Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c0525ad..eb3b0b8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -211,6 +211,10 @@
 # 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)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************