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

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

Change-Id: I7b09cd9d8c1b5c0fd5d0a8f34e64accfcb1eef89