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

Change-Id: Ic8a9ca281473cef1820685630c58fe47b38099a3