resolved conflicts for merge of 77efd7b4 to master

Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f

diff --cc target/board/generic_x86_64/device.mk
index b5b0faf,5b002bd..aa0e5a4
--- 1/target/board/generic_x86_64/device.mk
--- 2/target/board/generic_x86_64/device.mk
+++ b/target/board/generic_x86_64/device.mk
@@@ -25,10 -25,8 +25,11 @@@ PRODUCT_PROPERTY_OVERRIDES := 
  PRODUCT_COPY_FILES := \
      device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
      device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \
-     device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml
 +    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
 +    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
 +    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
+     device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \
+     system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc
  
  PRODUCT_PACKAGES := \
      audio.primary.goldfish \