Snap for 8390762 from 00e035315006647da52d0112d39a0c08f54f5939 to sc-qpr3-release

Change-Id: Icf266f32e0719ebff054015a788427422ecd96de
diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk
index 8013ca5..b7247e3 100644
--- a/64bitonly/product/vendor.mk
+++ b/64bitonly/product/vendor.mk
@@ -29,7 +29,7 @@
 
 DISABLE_RILD_OEM_HOOK := true
 
-DEVICE_MANIFEST_FILE := device/generic/goldfish/64bitonly/manifest.xml
+DEVICE_MANIFEST_FILE += device/generic/goldfish/64bitonly/manifest.xml
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera
 PRODUCT_SOONG_NAMESPACES += hardware/google/camera/devices/EmulatedCamera