Merge "Don't shared oem-defined libs to vendor apks"
am: b6e957a6e7

Change-Id: Ib8f178769b411be2c4764348ccbc5a14a8d3443a