Merge "libbundlewrapper: Build both static and shared libraries" am: 88a96f17b2 am: 8238aeaa3b am: f77442d7e4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1475737

Change-Id: Ia01870802b47c64c625c18c8949afebf72193427