diff --git a/android/camera/media_codecs.xml b/android/media/media_codecs.xml
similarity index 98%
rename from android/camera/media_codecs.xml
rename to android/media/media_codecs.xml
index 87d11f2..ee846da 100644
--- a/android/camera/media_codecs.xml
+++ b/android/media/media_codecs.xml
@@ -80,5 +80,6 @@ Only the three quirks included above are recognized at this point:
+
diff --git a/android/media/media_codecs_google_audio.xml b/android/media/media_codecs_google_audio.xml
new file mode 100644
index 0000000..632088a
--- /dev/null
+++ b/android/media/media_codecs_google_audio.xml
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/media/media_codecs_google_telephony.xml b/android/media/media_codecs_google_telephony.xml
new file mode 100644
index 0000000..5ad90d9
--- /dev/null
+++ b/android/media/media_codecs_google_telephony.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/media/media_codecs_google_tv.xml b/android/media/media_codecs_google_tv.xml
new file mode 100644
index 0000000..330c6fb
--- /dev/null
+++ b/android/media/media_codecs_google_tv.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/media/media_codecs_google_video.xml b/android/media/media_codecs_google_video.xml
new file mode 100644
index 0000000..829f403
--- /dev/null
+++ b/android/media/media_codecs_google_video.xml
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/camera/media_profiles.xml b/android/media/media_profiles.xml
similarity index 100%
rename from android/camera/media_profiles.xml
rename to android/media/media_profiles.xml
diff --git a/products/anbox.mk b/products/anbox.mk
index 73fd1a9..6ab2330 100644
--- a/products/anbox.mk
+++ b/products/anbox.mk
@@ -43,8 +43,12 @@ PRODUCT_COPY_FILES += \
vendor/anbox/android/init.goldfish.rc:root/init.goldfish.rc \
vendor/anbox/android/init.goldfish.sh:system/etc/init.goldfish.sh \
vendor/anbox/android/ueventd.goldfish.rc:root/ueventd.goldfish.rc \
- vendor/anbox/android/camera/media_profiles.xml:system/etc/media_profiles.xml \
- vendor/anbox/android/camera/media_codecs.xml:system/etc/media_codecs.xml \
+ vendor/anbox/android/media/media_profiles.xml:system/etc/media_profiles.xml \
+ vendor/anbox/android/media/media_codecs.xml:system/etc/media_codecs.xml \
+ vendor/anbox/android/media/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+ vendor/anbox/android/media/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+ vendor/anbox/android/media/media_codecs_google_tv.xml:system/etc/media_codecs_google_tv.xml \
+ vendor/anbox/android/media/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf
PRODUCT_CHARACTERISTICS := emulator