diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 0a3bab744..58170ec71 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -29,17 +29,15 @@ libcutils_nonwindows_sources = [
     "str_parms.c",
 ]
 
-cc_library_headers {
-    name: "libcutils_vndk_headers",
-    host_supported: true,
-    export_include_dirs: ["include_vndk"],
-}
-
 cc_library_headers {
     name: "libcutils_headers",
+    vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
     target: {
+        vendor: {
+            export_include_dirs: ["include_vndk"],
+        },
         linux_bionic: {
             enabled: true,
         },
@@ -51,6 +49,7 @@ cc_library_headers {
 
 cc_library {
     name: "libcutils",
+    vendor_available: true,
     host_supported: true,
     srcs: [
         "config_utils.c",