diff --git a/proprietary-files.txt b/proprietary-files.txt
index f10618e..76cc7f8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -38,7 +38,6 @@ vendor/bin/main_abox
 vendor/bin/mcDriverDaemon
 vendor/bin/secril_config_svc
 vendor/bin/wlbtd
-vendor/etc/a2dp_audio_policy_configuration.xml
 vendor/etc/audio_board_info.xml
 vendor/etc/audio_policy_volumes.xml
 vendor/etc/audio_policy_volumes_sec.xml
@@ -46,7 +45,6 @@ vendor/etc/default_volume_tables.xml
 vendor/etc/floating_feature.xml
 vendor/etc/gnss/ca.pem
 vendor/etc/gnss/gps.cfg
-vendor/etc/hearing_aid_audio_policy_configuration.xml
 vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc
 vendor/etc/init/android.hardware.wifi@1.0-service.rc
 vendor/etc/init/hostapd.android.rc
@@ -63,10 +61,6 @@ vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc
 vendor/etc/init/wifi.rc
 vendor/etc/init/wifi_slsi.rc
 vendor/etc/media_codecs.xml
-vendor/etc/media_codecs_google_audio.xml
-vendor/etc/media_codecs_google_telephony.xml
-vendor/etc/media_codecs_google_video.xml
-vendor/etc/media_codecs_google_video_le.xml
 vendor/etc/media_codecs_performance.xml
 vendor/etc/media_profiles_V1_0.xml
 vendor/etc/mixer_gains.xml
@@ -95,14 +89,12 @@ vendor/etc/permissions/android.hardware.wifi.xml
 vendor/etc/permissions/android.software.ipsec_tunnels.xml
 vendor/etc/permissions/android.software.midi.xml
 vendor/etc/permissions/handheld_core_hardware.xml
-vendor/etc/playback_record_audio_policy_configuration.xml
 vendor/etc/plmn_delta.bin
 vendor/etc/plmn_delta_attaio.bin
 vendor/etc/plmn_delta_hktw.bin
 vendor/etc/plmn_delta_usacdma.bin
 vendor/etc/plmn_delta_usagsm.bin
 vendor/etc/plmn_se13.bin
-vendor/etc/r_submix_audio_policy_configuration.xml
 vendor/etc/seccomp_policy/configstore@1.1.policy
 vendor/etc/seccomp_policy/mediacodec.policy
 vendor/etc/seccomp_policy/mediaextractor.policy
@@ -120,7 +112,6 @@ vendor/etc/selinux/vendor_property_contexts
 vendor/etc/selinux/vendor_seapp_contexts
 vendor/etc/selinux/vendor_sepolicy.cil
 vendor/etc/selinux/vndservice_contexts
-vendor/etc/usb_audio_policy_configuration.xml
 vendor/etc/wifi/hydra_config.sdb
 vendor/etc/wifi/indoorchannel.info
 vendor/etc/wifi/mx
diff --git a/universal7904-common.mk b/universal7904-common.mk
index fc2141a..09cb362 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -20,6 +20,9 @@ PRODUCT_PACKAGES += \
     audio.usb.default
 
 PRODUCT_COPY_FILES += \
+    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+    frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
+    frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
     $(LOCAL_PATH)/configs/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     $(LOCAL_PATH)/configs/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
 
@@ -102,6 +105,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-service.samsung
 
+# Media
+PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml
+
 # Memtrack
 PRODUCT_PACKAGES += \
     android.hardware.memtrack@1.0-impl \