Snap for 6377590 from 78b8547c112f065bd25c78be476f7d5984a3dfaa to r-keystone-qcom-release

Change-Id: I67336263eba1e00dc3f2e7b999f71534eb142141
diff --git a/Android.bp b/Android.bp
index 8390a3d..410dbbc 100755
--- a/Android.bp
+++ b/Android.bp
@@ -19,10 +19,16 @@
     vendor_available: true,
     recovery_available: true,
 
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+    ],
+
     visibility: [
         "//bootable/recovery:__subpackages__",
         "//external/bsdiff:__subpackages__",
         "//external/puffin:__subpackages__",
+        "//system/core/adb:__subpackages__",
         "//system/update_engine:__subpackages__",
     ],
 
@@ -40,6 +46,9 @@
         linux_bionic: {
             enabled: true,
         },
+        windows: {
+            enabled: true,
+        },
     },
     stl: "none",
 }