diff --git a/fvp.mk b/fvp.mk
index 888d9f0..75ddabd 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -113,7 +113,7 @@
 # It's almost always faster to dexopt on the host even in eng builds.
 WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
 
-DEVICE_MANIFEST_FILE := device/generic/goldfish/fvpbase/manifest.xml
+DEVICE_MANIFEST_FILE += device/generic/goldfish/fvpbase/manifest.xml
 
 # Use a multilib setup (see fvpbase/BoardConfig.mk).
 FVP_MULTILIB_BUILD := true
diff --git a/vendor.mk b/vendor.mk
index a6a842c..fdbb77e 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -29,7 +29,7 @@
 
 DISABLE_RILD_OEM_HOOK := true
 
-DEVICE_MANIFEST_FILE := device/generic/goldfish/manifest.xml
+DEVICE_MANIFEST_FILE += device/generic/goldfish/manifest.xml
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera