diff --git a/CleanSpec.mk b/CleanSpec.mk
index 767726108d..bb3b04f8b9 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -488,6 +488,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher3)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher3_intermediates)
 
+# Remove old merged AndroidManifest.xml location
+$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*_intermediates/AndroidManifest.xml)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index a3861aad76..c8c7333fe0 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -29,7 +29,7 @@ endif  # LOCAL_STATIC_JAVA_AAR_LIBRARIES
 ifneq (,$(strip $(my_full_libs_manifest_files)))
 
 main_android_manifest := $(full_android_manifest)
-full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml
+full_android_manifest := $(intermediates.COMMON)/manifest/AndroidManifest.xml
 $(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
 $(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)
 $(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)