Merge "Set apex_available property"
diff --git a/Android.bp b/Android.bp
index 659525e..89d97ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,8 +114,7 @@
     },
     apex_available: [
         "//apex_available:platform",
-        "com.android.adbd",
-        "test_com.android.adbd",
+        "//apex_available:anyapex",
     ],
 }
 
@@ -447,6 +446,12 @@
     },
 
     java_version: "1.7",
+
+    apex_available: [
+        "//apex_available:platform",
+        // TODO(b/151068271) switch this to //apex_available:anyapex
+        "com.android.wifi",
+    ],
 }
 
 // Java nano library (compatibility for old host-side users)
@@ -468,6 +473,12 @@
     sdk_version: "8",
 
     srcs: ["javamicro/src/main/java/com/google/protobuf/micro/**/*.java"],
+
+    apex_available: [
+        "//apex_available:platform",
+        // TODO(b/151068271) switch this to //apex_available:anyapex
+        "com.android.bluetooth.updatable",
+    ],
 }
 
 // Java micro library (compatibility for old host-side users)
@@ -580,6 +591,12 @@
     },
 
     java_version: "1.7",
+
+    apex_available: [
+        "//apex_available:platform",
+        // TODO(b/151068271) switch below to //apex_available:anyapex
+        "com.android.bluetooth.updatable",
+    ],
 }
 
 // Java lite library (compatibility for old host-side users)