diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7193d26..40aac18 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -25,12 +25,7 @@
       "name": "hidl_test"
     },
     {
-       "name": "CtsOsTestCases",
-       "options": [
-           {
-              "include-filter": "android.os.cts.HwBinderTest"
-           }
-       ]
+      "name": "CtsOsTestCases_cts_hwbindertest"
     }
   ]
 }
diff --git a/transport/allocator/1.0/default/Android.bp b/transport/allocator/1.0/default/Android.bp
index d739cd8..7389a96 100644
--- a/transport/allocator/1.0/default/Android.bp
+++ b/transport/allocator/1.0/default/Android.bp
@@ -21,16 +21,22 @@
     default_applicable_licenses: ["system_libhidl_license"],
 }
 
+vintf_fragment {
+    name: "android.hidl.allocator@1.0-service.xml",
+    src: "android.hidl.allocator@1.0-service.xml",
+    system_ext_specific: true,
+}
+
 cc_binary {
     name: "android.hidl.allocator@1.0-service",
     relative_install_path: "hw",
     defaults: ["libhidl-defaults"],
     srcs: [
         "AshmemAllocator.cpp",
-        "service.cpp"
+        "service.cpp",
     ],
     init_rc: ["android.hidl.allocator@1.0-service.rc"],
-    vintf_fragments: ["android.hidl.allocator@1.0-service.xml"],
+    vintf_fragment_modules: ["android.hidl.allocator@1.0-service.xml"],
     system_ext_specific: true,
 
     shared_libs: [