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

Change-Id: Ia9fa3d3d719cd02eb597cdffded51c6c1bfc1bfe