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

Change-Id: I83420882983214fd684cdad919940e8939651a48