merge 601d39b688bcbb1789e145d1b72753206c24d374

Change-Id: I9795ab63b29481de392a8672d272082270894e1f

diff --cc CleanSpec.mk
index 9582513,f4f79cf..3f8344f
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -1,4 -1,4 +1,4 @@@
--# Copyright (C) 2007 The Android Open Source Project
++
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -214,9 -208,9 +214,12 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  # 4.4.1
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 +# 4.4.2
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +
+ # 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
  # ************************************************