diff --git a/core/cleanspec.mk b/core/cleanspec.mk
index 566f7e78c..675c7da14 100644
--- a/core/cleanspec.mk
+++ b/core/cleanspec.mk
@@ -174,6 +174,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/soundback.apk)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/talkback.apk)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Launcher*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher*.apk)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Music*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Music*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/jsr305_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/guava_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST