Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a565149246 am: a4abf50c68
am: ec7ba37c41

Change-Id: Id050d56e8f8442f413f17bb89314ade516a800ac
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..d37b2fd 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,6 +44,8 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/junit4-target_intermediates)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************