Snap for 6507440 from 57436fbd9c1a533d7a77b9649ccfdc5d2bd702da to rvc-release

Change-Id: Ic2ea1e0e81ada7e4ce4ad3b968ea6a4b9c621b70
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index c97abc3..f5f21f3 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -18,6 +18,8 @@
 # it supports a few Android virtual devices. Note that this is _not_ the
 # same as running under the Android emulator.
 
+PRODUCT_SOONG_NAMESPACES += device/generic/goldfish
+
 PRODUCT_PACKAGES += \
     com.android.adbd \
     android.hidl.allocator@1.0-service \