Combine libhidlbase/libhidltransport into one lib.

For performance/memory. HIDL transport split at this level will be
de-emphasized moving forward as it is not necessary.

Bug: 134961554
Test: librank
Change-Id: I66183294232bdd0616a943d6cdd08254732ffb45
diff --git a/Android.bp b/Android.bp
index 97ed108..084763c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,3 +46,36 @@
         "-g",
     ],
 }
+
+cc_library {
+    name: "libhidlbase",
+    recovery_available: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+
+    defaults: [
+        "libhidlbase-impl-shared-libs",
+        "libhidltransport-impl-shared-libs",
+    ],
+
+    whole_static_libs: [
+        "libhidlbase-impl-internal",
+        "libhidltransport-impl-internal",
+    ],
+}
+
+// WARNING: deprecated
+// This library is no longer required, and dependencies should be taken
+// on libhidlbase instead.
+cc_library {
+    name: "libhidltransport",
+    recovery_available: true,
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
+}