DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I6dc0fbb45d506f97392b4a10097c922d47a2f4a5
diff --git a/Android.bp b/Android.bp
index d0e5933..9f68463 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,8 +33,15 @@
 cc_library_static {
     name: "libbspatch",
     defaults: ["bsdiff_defaults"],
+    vendor_available: true,
     recovery_available: true,
 
+    visibility: [
+        "//bootable/recovery:__subpackages__",
+        "//external/puffin:__subpackages__",
+        "//system/update_engine:__subpackages__",
+    ],
+
     srcs: [
         "brotli_decompressor.cc",
         "bspatch.cc",
diff --git a/OWNERS b/OWNERS
index ef9a19a..ab036c1 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,3 @@
 deymo@google.com
 senj@google.com
-tbao@google.com
+xunchang@google.com