Merge 84088254b41521a4db457759f8e69782b6dc7a04 on remote branch

Change-Id: I464955a09f75240ab02bb81d29b763da6fbbc2ec
diff --git a/Android.bp b/Android.bp
index d86573e..3c03e6c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,20 @@
 }
 
 java_library {
+    name: "grpc-java-lite",
+    static_libs: [
+        "grpc-java-context",
+        "grpc-java-core",
+        "grpc-java-core-inprocess",
+        "grpc-java-core-internal",
+        "grpc-java-core-util",
+        "grpc-java-protobuf-lite",
+        "grpc-java-stub",
+    ],
+    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
+}
+
+java_library {
     name: "grpc-java-okhttp-client-lite",
     host_supported: true,
     static_libs: [
diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp
index 1902402..e4563a1 100644
--- a/netty/shaded/Android.bp
+++ b/netty/shaded/Android.bp
@@ -34,3 +34,11 @@
         "grpc-netty-shaded-1.16.1-jar",
     ],
 }
+
+java_library {
+    name: "grpc-java-netty-shaded-test",
+    static_libs: [
+        "grpc-netty-shaded-1.16.1-jar",
+    ],
+    visibility: ["//packages/modules/Bluetooth/android/blueberry/server"],
+}