resolved conflicts for merge of 2812b27c to lmp-dev-plus-aosp

Change-Id: I770fbf16affbd43b0750b50426298038e4b573b7
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4e90c90..ab0bd2f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -283,6 +283,10 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)
+
+# Switch host builds to Clang by default
+$(call add-clean-step, rm -rf $(OUT_DIR)/host)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************