diff --git a/service/Android.bp b/service/Android.bp
index 2af2b653511de7c9c7122bf6f2506d88d40cb0db..5917c0ebca08c06c1e8186dc3a1bb82f620905bc 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -33,16 +33,7 @@ cc_binary {
 
     required: ["android.hardware.media.c2@1.2-default-seccomp_policy"],
 
-    compile_multilib: "both",
-    multilib: {
-        lib32: {
-            suffix: "-32",
-            init_rc: ["android.hardware.media.c2@1.0-service-v4l2-32.rc"],
-        },
-        lib64: {
-            suffix: "-64",
-            init_rc: ["android.hardware.media.c2@1.0-service-v4l2-64.rc"],
-        },
-    },
+    compile_multilib: "first",
+    init_rc: ["android.hardware.media.c2@1.0-service-v4l2.rc"],
     vintf_fragments: ["android.hardware.media.c2@1.2-service-v4l2.xml"],
 }
diff --git a/service/android.hardware.media.c2@1.0-service-v4l2-64.rc b/service/android.hardware.media.c2@1.0-service-v4l2-64.rc
deleted file mode 100644
index 454953b8dfd181c7f15474c5ebea3a1f28f7abcb..0000000000000000000000000000000000000000
--- a/service/android.hardware.media.c2@1.0-service-v4l2-64.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2-64
-    class hal
-    user media
-    group mediadrm drmrpc
-    ioprio rt 4
-    task_profiles ProcessCapacityHigh
-    setenv MESA_GLSL_CACHE_DISABLE 1
diff --git a/service/android.hardware.media.c2@1.0-service-v4l2-32.rc b/service/android.hardware.media.c2@1.0-service-v4l2.rc
similarity index 82%
rename from service/android.hardware.media.c2@1.0-service-v4l2-32.rc
rename to service/android.hardware.media.c2@1.0-service-v4l2.rc
index e4ddbc3a19a1c7e5e7828632c8c9357eac285161..8d1a45ba0fc6855620f07af4e729e18c36d5c931 100644
--- a/service/android.hardware.media.c2@1.0-service-v4l2-32.rc
+++ b/service/android.hardware.media.c2@1.0-service-v4l2.rc
@@ -1,4 +1,4 @@
-service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2-32
+service android-hardware-media-c2-v4l2-hal-1-0 /vendor/bin/hw/android.hardware.media.c2@1.0-service-v4l2
     class hal
     user media
     group mediadrm drmrpc