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

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

Change-Id: Ib064438b2546ab628baa5b3d381dd6c7355e791f