Merge "Restore libhidl_test Android.bp"
diff --git a/Android.bp b/Android.bp
index 7b4412a..29f9b56 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,15 +44,12 @@
     shared_libs: [
         "android.hidl.memory@1.0",
         "libbase",
+        "libhidlbase",
+        "liblog",
         "libutils",
         "libcutils",
-        "libvndksupport",
     ],
-    static_libs: [
-        "libhidlbase",
-        "libgtest",
-        "libgmock"
-    ],
+    static_libs: ["libgtest", "libgmock"],
 
     cflags: [
         "-O0",