Merge "clean-oat should remove intermediate oat files" into ics-mr1-plus-art
diff --git a/Android.mk b/Android.mk
index fe70b0c..6eb4299 100644
--- a/Android.mk
+++ b/Android.mk
@@ -243,6 +243,8 @@
 	rm -f $(TARGET_OUT_JAVA_LIBRARIES)/*.oat
 	rm -f $(TARGET_OUT_JAVA_LIBRARIES)/*.art
 	rm -f $(TARGET_OUT_APPS)/*.oat
+	rm -f $(TARGET_OUT_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/javalib.jar.oat
+	rm -f $(TARGET_OUT_INTERMEDIATES)/APPS/*_intermediates/package.apk.oat
 	adb remount
 	adb shell rm $(ART_NATIVETEST_DIR)/*.oat
 	adb shell rm $(ART_NATIVETEST_DIR)/*.art