am 0ddbc6c2: Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp

* commit '0ddbc6c215c34f708fcc898be25ddffc18282881':
  CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 9582513..70773bd 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -217,6 +217,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
 # ************************************************