diff --git a/cas/aidl/default/Android.bp b/cas/aidl/default/Android.bp
index 9d094e0..576016e 100644
--- a/cas/aidl/default/Android.bp
+++ b/cas/aidl/default/Android.bp
@@ -26,7 +26,6 @@
         "liblog",
         "libutils",
         "libcutils",
-        "libvndksupport",
     ],
     static_libs: [
         "libaidlcommonsupport",
@@ -44,39 +43,34 @@
 
     srcs: ["service.cpp"],
 
-    stl: "c++_static",
     static_libs: [
-        "android.hardware.cas-V1-ndk",
-        "android.hardware.common-V2-ndk",
         "libaidlcommonsupport",
-        "libbase",
         "libcasexampleimpl",
-        "libcutils",
-        "libutils",
     ],
     shared_libs: [
+        "android.hardware.cas-V1-ndk",
+        "libbase",
         "libbinder_ndk",
         "liblog",
-        "libvndksupport",
+        "libutils",
+        "libcutils",
     ],
     header_libs: ["media_plugin_headers"],
+    vintf_fragments: ["android.hardware.cas-service.xml"],
 }
 
 cc_binary {
     name: "android.hardware.cas-service.example",
     defaults: ["cas_service_example_defaults"],
-    // Installed in APEX
-    installable: false,
+    init_rc: ["cas-default.rc"],
 }
 
-// TODO(b/297467514) Convert to VAPEX
 cc_binary {
     name: "android.hardware.cas-service.example-lazy",
     defaults: ["cas_service_example_defaults"],
     init_rc: ["cas-default-lazy.rc"],
-    vintf_fragments: ["android.hardware.cas-service.xml"],
     cflags: ["-DLAZY_SERVICE"],
-    overrides: ["com.android.hardware.cas"],
+    overrides: ["android.hardware.cas-service.example"],
 }
 
 cc_fuzz {
@@ -90,7 +84,6 @@
         "android.hardware.cas-V1-ndk",
         "libcutils",
         "liblog",
-        "libvndksupport",
     ],
     static_libs: [
         "libaidlcommonsupport",
@@ -101,34 +94,3 @@
         componentid: 1344,
     },
 }
-
-apex {
-    name: "com.android.hardware.cas",
-    manifest: "manifest.json",
-    file_contexts: "file_contexts",
-    key: "com.android.hardware.key",
-    certificate: ":com.android.hardware.certificate",
-    updatable: false,
-    vendor: true,
-
-    binaries: [
-        "android.hardware.cas-service.example",
-    ],
-    prebuilts: [
-        "cas-default.rc",
-        "android.hardware.cas-service.xml",
-    ],
-}
-
-prebuilt_etc {
-    name: "cas-default.rc",
-    src: "cas-default.rc",
-    installable: false,
-}
-
-prebuilt_etc {
-    name: "android.hardware.cas-service.xml",
-    src: "android.hardware.cas-service.xml",
-    sub_dir: "vintf",
-    installable: false,
-}