diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml
index edbb594..3610d6c 100644
--- a/configs/media/media_codecs.xml
+++ b/configs/media/media_codecs.xml
@@ -124,9 +124,8 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Settings>
+        <Domain name="telephony" enabled="true" />
         <Setting name="max-video-encoder-input-buffers" value="11" />
     </Settings>
     <Encoders>
@@ -350,7 +349,5 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="6" />
             <Limit name="performance-point-3840x2160" value="60" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100" />
     </Decoders>
-    <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>
diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index dd2a393..e3faf34 100644
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -49,47 +49,24 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="49-49" />
             <Limit name="measured-frame-rate-1920x1080" range="16-40" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="215-215" />
-            <Limit name="measured-frame-rate-720x480" range="100-100" />
-            <Limit name="measured-frame-rate-1280x720" range="56-56" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-30" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="190-380" />
             <Limit name="measured-frame-rate-720x480" range="55-110" />
             <Limit name="measured-frame-rate-1280x720" range="30-78" />
             <Limit name="measured-frame-rate-1920x1080" range="22-45" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-200" />
-        </MediaCodec>
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="213-380" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="370-390" />
-        </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.encoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="200-380" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="68-70" />
-            <Limit name="measured-frame-rate-640x360" range="32-32" />
-            <Limit name="measured-frame-rate-1280x720" range="17-24" />
-            <Limit name="measured-frame-rate-1920x1080" range="8-12" />
-        </MediaCodec>
         <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="75-150" />
             <Limit name="measured-frame-rate-640x360" range="42-75" />
             <Limit name="measured-frame-rate-1280x720" range="14-35" />
             <Limit name="measured-frame-rate-1920x1080" range="10-19" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="205-205" />
-            <Limit name="measured-frame-rate-640x360" range="68-68" />
-            <Limit name="measured-frame-rate-1280x720" range="17-17" />
-        </MediaCodec>
         <MediaCodec name="c2.android.hevc.encoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-320x240" range="21-38" />
         </MediaCodec>
@@ -130,33 +107,16 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="155-155" />
             <Limit name="measured-frame-rate-3840x2160" range="36-36" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="410-410" />
-            <Limit name="measured-frame-rate-720x480" range="129-129" />
-            <Limit name="measured-frame-rate-1280x720" range="111-112" />
-            <Limit name="measured-frame-rate-1920x1080" range="24-24" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="410-410" />
             <Limit name="measured-frame-rate-720x480" range="129-129" />
             <Limit name="measured-frame-rate-1280x720" range="10-52" />
             <Limit name="measured-frame-rate-1920x1080" range="24-24" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="160-160" />
-            <Limit name="measured-frame-rate-352x288" range="172-172" />
-        </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="600-750" />
             <Limit name="measured-frame-rate-352x288" range="172-172" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="340-340" />
-            <Limit name="measured-frame-rate-640x360" range="200-200" />
-            <Limit name="measured-frame-rate-720x480" range="180-180" />
-            <Limit name="measured-frame-rate-1280x720" range="80-80" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-40" />
-        </MediaCodec>
         <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="160-560" />
             <Limit name="measured-frame-rate-640x360" range="30-120" />
@@ -164,23 +124,11 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="80-80" />
             <Limit name="measured-frame-rate-1920x1080" range="40-40" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
-            <Type name="video/mp4v-es">
-                <Limit name="measured-frame-rate-176x144" range="165-165" />
-            </Type>
-        </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" update="true">
             <Type name="video/mp4v-es">
                 <Limit name="measured-frame-rate-176x144" range="570-990" />
             </Type>
         </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="170-500" />
-            <Limit name="measured-frame-rate-320x240" range="1318-1318" />
-            <Limit name="measured-frame-rate-640x360" range="100-110" />
-            <Limit name="measured-frame-rate-1280x720" range="100-100" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-40" />
-        </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="170-500" />
             <Limit name="measured-frame-rate-320x240" range="1318-1318" />
@@ -188,12 +136,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="100-100" />
             <Limit name="measured-frame-rate-1920x1080" range="40-40" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x240" range="472-472" />
-            <Limit name="measured-frame-rate-640x360" range="177-177" />
-            <Limit name="measured-frame-rate-1280x720" range="90-90" />
-            <Limit name="measured-frame-rate-1920x1080" range="54-54" />
-        </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x240" range="472-472" />
             <Limit name="measured-frame-rate-640x360" range="177-177" />
diff --git a/device.mk b/device.mk
index ff0e77a..005d966 100644
--- a/device.mk
+++ b/device.mk
@@ -205,10 +205,7 @@ PRODUCT_PACKAGES += vendor.lineage.livedisplay@2.0-service-sdm
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
     $(LOCAL_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
-    $(LOCAL_PATH)/configs/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
-    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
+    $(LOCAL_PATH)/configs/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
 # Mlipay
 PRODUCT_PACKAGES += \