Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: aef7026aea  -s ours am: a6c8957936
am: 5cc1eab11e  -s ours

Change-Id: I6dbcf22b088ce56077f625a50d80d383b8d8c309
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: {