diff --git a/device.mk b/device.mk
index 8eac35e..de2a811 100644
--- a/device.mk
+++ b/device.mk
@@ -161,7 +161,7 @@ PRODUCT_COPY_FILES += \
 
 # FFmpeg
 PRODUCT_PACKAGES += \
-    android.hardware.media.c2@1.2-service-ffmpeg
+    android.hardware.media.c2-service-ffmpeg
 
 # Gatekeeper
 PRODUCT_PACKAGES += \
diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index af5035e..db697fe 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -8,13 +8,4 @@
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.media.c2</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>ffmpeg</instance>
-        </interface>
-    </hal>
 </compatibility-matrix>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index d41ee66..d0d7759 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -6,7 +6,7 @@
 /data/vendor/mediadrm(/.*)?  u:object_r:mediadrm_vendor_data_file:s0
 
 # FFmpeg
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg  u:object_r:mediacodec_exec:s0
+/vendor/bin/hw/android\.hardware\.media\.c2-service-ffmpeg  u:object_r:mediacodec_exec:s0
 
 # Graphics
 /dev/dri(/.*)?                                                                   u:object_r:gpu_device:s0
diff --git a/vendor.prop b/vendor.prop
index 20c9575..c7f45b7 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -67,6 +67,7 @@ ro.lockscreen.disable.default=true
 
 # Media
 debug.stagefright.c2inputsurface=-1
+media.c2.hal.selection=aidl
 
 # MGLRU
 persist.device_config.mglru_native.lru_gen_config=core