diff --git a/libs/gralloc/types/Android.bp b/libs/gralloc/types/Android.bp
index e1693cf..00f7484 100644
--- a/libs/gralloc/types/Android.bp
+++ b/libs/gralloc/types/Android.bp
@@ -33,16 +33,16 @@
     ],
 
     shared_libs: [
+        "android.hardware.graphics.common-ndk_platform",
         "android.hardware.graphics.mapper@4.0",
         "libhidlbase",
         "liblog",
-        "vintf-graphics-common-ndk_platform",
     ],
 
     export_shared_lib_headers: [
+        "android.hardware.graphics.common-ndk_platform",
         "android.hardware.graphics.mapper@4.0",
         "libhidlbase",
-        "vintf-graphics-common-ndk_platform",
     ],
 
     export_include_dirs: [
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 124bda2..043f2ca 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -82,6 +82,7 @@
         "android.hardware.graphics.allocator@2.0",
         "android.hardware.graphics.allocator@3.0",
         "android.hardware.graphics.allocator@4.0",
+        "android.hardware.graphics.common-ndk_platform",
         "android.hardware.graphics.common@1.2",
         "android.hardware.graphics.mapper@2.0",
         "android.hardware.graphics.mapper@2.1",
@@ -94,14 +95,13 @@
         "libsync",
         "libutils",
         "liblog",
-        "vintf-graphics-common-ndk_platform",
     ],
 
     export_shared_lib_headers: [
         "android.hardware.graphics.common@1.2",
+        "android.hardware.graphics.common-ndk_platform",
         "android.hardware.graphics.mapper@4.0",
         "libgralloctypes",
-        "vintf-graphics-common-ndk_platform",
     ],
 
     static_libs: [