Merge 8664008c to master

Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk
index 3a1d2f0..7533a61 100644
--- a/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@ -26,4 +26,7 @@
     development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
     development/data/etc/vold.conf:system/etc/vold.conf \
     development/tools/emulator/system/camera/media_profiles.xml:system/etc/media_profiles.xml \
-    development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \
+    development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml
+
+PRODUCT_PACKAGES := \
+    audio.primary.goldfish