diff --git a/common.mk b/common.mk
index cee6a68..c2bb2a4 100644
--- a/common.mk
+++ b/common.mk
@@ -272,11 +272,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/media/yupik/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \
$(LOCAL_PATH)/media/yupik/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml
-PRODUCT_COPY_FILES += \
- frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.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
-
PRODUCT_PACKAGES += \
libavservices_minijail \
libavservices_minijail.vendor \
diff --git a/media/lahaina/media_codecs_lahaina_vendor.xml b/media/lahaina/media_codecs_lahaina_vendor.xml
index a9bc93e..b84dedb 100644
--- a/media/lahaina/media_codecs_lahaina_vendor.xml
+++ b/media/lahaina/media_codecs_lahaina_vendor.xml
@@ -328,5 +328,4 @@
-
diff --git a/media/yupik/media_codecs_yupik_v1.xml b/media/yupik/media_codecs_yupik_v1.xml
index c39f329..f741f06 100644
--- a/media/yupik/media_codecs_yupik_v1.xml
+++ b/media/yupik/media_codecs_yupik_v1.xml
@@ -288,5 +288,4 @@
-