Merge cherrypicks of ['android-review.googlesource.com/3177740'] into 24Q3-release.

Change-Id: I9f8a641105d9d74ea93c9886c5153d8286f34861

Android.bp

@@ -51,6 +51,7 @@ cc_defaults {
     // Lists all dependencies that can *not* be expected on the device.
     static_libs: [
         "VtsHalHidlTestUtils",
+        "libhidlbase",
         "libhidl-gen-utils",
     ],
 
@@ -72,6 +73,14 @@ cc_defaults {
         "-g",
     ],
 
+    target: {
+        android: {
+            shared_libs: [
+                "libvndksupport",
+            ],
+        },
+    },
+
     require_root: true,
 }