diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml
index a9dcdd3..771a071 100644
--- a/configs/media/media_codecs.xml
+++ b/configs/media/media_codecs.xml
@@ -83,7 +83,7 @@ Only the three quirks included above are recognized at this point:
     <Include href="media_codecs_c2.xml" />
     <Include href="media_codecs_mediatek_audio.xml" />
     <Include href="media_codecs_mediatek_video.xml" />
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_google_video_le.xml" />
     <Include href="media_codecs_dolby_audio.xml" />
+    <Include href="media_codecs_google_c2_audio.xml" />
+    <Include href="media_codecs_google_c2_video.xml" />
 </MediaCodecs>
diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index 5d31e36..2b8707d 100644
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -101,21 +101,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-3840x2160" range="22-49" />
         </MediaCodec>
         <!-- Google codec -->
-        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="736-1619" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="685-1508" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="346-761" />
-            <Limit name="measured-frame-rate-720x480" range="102-224" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="149-327" />
-            <Limit name="measured-frame-rate-640x360" range="49-107" />
-            <Limit name="measured-frame-rate-1280x720" range="29-64" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="101-223" />
             <Limit name="measured-frame-rate-720x480" range="72-158" />
@@ -172,35 +157,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-1920x1080" range="90-198" />
         </MediaCodec>
         <!-- Google codec -->
-        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="427-940" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="361-794" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="553-1216" />
-            <Limit name="measured-frame-rate-720x480" range="131-288" />
-            <Limit name="measured-frame-rate-1280x720" range="62-137" />
-            <Limit name="measured-frame-rate-1920x1080" range="27-59" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="681-1499" />
-            <Limit name="measured-frame-rate-640x360" range="307-675" />
-            <Limit name="measured-frame-rate-720x480" range="284-625" />
-            <Limit name="measured-frame-rate-1280x720" range="99-217" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="1129-2483" />
-            <Limit name="measured-frame-rate-640x360" range="350-771" />
-            <Limit name="measured-frame-rate-1280x720" range="64-140" />
-            <Limit name="measured-frame-rate-1920x1080" range="31-69" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="816-1795" />
-            <Limit name="measured-frame-rate-640x360" range="340-747" />
-            <Limit name="measured-frame-rate-1280x720" range="85-186" />
-        </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="359-790" />
         </MediaCodec>
diff --git a/device.mk b/device.mk
index 2e61c80..7d88356 100644
--- a/device.mk
+++ b/device.mk
@@ -181,8 +181,8 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_video.xml \
 
 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_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
+    frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml
 
 # Neural
 PRODUCT_PACKAGES += \
diff --git a/vendor.prop b/vendor.prop
index 24dac94..74ae94e 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -204,6 +204,7 @@ ro.lmk.thrashing_limit=30
 ro.lmk.thrashing_limit_decay=2
 
 # Media
+debug.stagefright.ccodec=1
 media.stagefright.thumbnail.prefer_hw_codecs=true
 ro.vendor.mtk_config_max_dram_size=0x800000000
 ro.vendor.pref_scale_enable_cfg=1