diff --git a/CleanSpec.mk b/CleanSpec.mk
index 757c513a4c..ac2599605e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -620,6 +620,8 @@ $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "generated_*_image_info
 
 # Clean up libicuuc.so and libicui18n.so
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libicu*)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/core/java.mk b/core/java.mk
index 66431e952c..40fa594b92 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -108,7 +108,7 @@ aidl_preprocess_import :=
 ifdef LOCAL_SDK_VERSION
 ifneq ($(filter current system_current test_current core_current, $(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS_USE_PREBUILT_SDK)),)
   # LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS
-  aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
+  aidl_preprocess_import := $(FRAMEWORK_AIDL)
 else
   aidl_preprocess_import := $(call resolve-prebuilt-sdk-aidl-path,$(LOCAL_SDK_VERSION))
 endif # not current or system_current