Snap for 5999261 from c8c2190ff37607fdf3e378695bbd9d169759a922 to r-keystone-qcom-release

Change-Id: Ie8026c3f6fe40c6787f9445655325e12693cc7dc
diff --git a/Android.bp b/Android.bp
index a2023e7..21d7bfa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,10 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library {
+cc_library_static {
     name: "libbz",
     host_supported: true,
+    vendor_available: true,
     recovery_available: true,
+    visibility: [
+        "//bootable/recovery:__subpackages__",
+        "//external/bsdiff:__subpackages__",
+        "//external/puffin:__subpackages__",
+        "//system/update_engine:__subpackages__",
+    ],
     arch: {
         arm: {
             // measurements show that the ARM version of ZLib is about x1.17 faster
@@ -51,7 +58,7 @@
         "-Werror",
         "-Wno-unused-parameter",
     ],
-    shared_libs: ["libbz"],
+    static_libs: ["libbz"],
     srcs: ["bzip2.c"],
     stl: "none",
     symlinks: [
diff --git a/OWNERS b/OWNERS
index 43d1bd3..7cbdceb 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,4 @@
 deymo@google.com
 enh@google.com
 senj@google.com
-tbao@google.com
 xunchang@google.com