Cleanspec rules to take care of old (pre-static) libraries.
(The build system doesn't react gracefully when something is switched
from a shared library to a static library.)
diff --git a/core/cleanspec.mk b/core/cleanspec.mk
index 86ea267..675c7da 100644
--- a/core/cleanspec.mk
+++ b/core/cleanspec.mk
@@ -176,6 +176,8 @@
$(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