Merge "Apks are again allowed to use vendor libs as before" am: 2aef19528e am: 9a4bd94594
am: 8846c69e26

Change-Id: I62e3101428f1bc18b08b6220512a4651f84d92e7