Merge 8664008c to master

Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636

diff --cc target/board/generic_x86/device.mk
index 3a1d2f0,fdd74bd..7533a61
--- 1/target/board/generic_x86/device.mk
--- 2/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@@ -25,5 -25,7 +25,8 @@@ PRODUCT_PROPERTY_OVERRIDES := 
  PRODUCT_COPY_FILES := \
      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_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