diff --git a/build/Android.mk b/build/Android.mk
index c25da0568..8305ec176 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -106,7 +106,8 @@ ALL_SDK_FILES += $(full_target)
 $(call dist-for-goals,sdk win_sdk,$(full_target):data/api-versions.xml)
 
 # ======= Lint Annotations zip ===========
-full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/sdk-annotations.zip
+$(eval $(call copy-one-file,$(call intermediates-dir-for,ETC,sdk-annotations.zip)/sdk-annotations.zip,$(full_target)))
 ALL_SDK_FILES += $(full_target)
 $(call dist-for-goals,sdk win_sdk,$(full_target):data/annotations.zip)
 
diff --git a/build/sdk.atree b/build/sdk.atree
index b54a94a71..cc160f22b 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -95,7 +95,7 @@ ${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_generated-api-version
 
 # API annotations database for lint
 prebuilts/sdk/sdk-annotations/annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip
-${OUT_DIR}/target/common/obj/PACKAGING/framework-doc-stubs_annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip
+${OUT_DIR}/target/common/obj/PACKAGING/sdk-annotations.zip platforms/${PLATFORM_NAME}/data/annotations.zip
 
 # Eclipse Editors support
 frameworks/base/core/res/res              platforms/${PLATFORM_NAME}/data/res