Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: I24d8297e4aa456f6b6785c81e53752d5c7884f22
diff --git a/Android.bp b/Android.bp
index 27cb093..080b563 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {
     name: "libvorbisidec",
     vendor_available: true,
     vndk: {