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

Change-Id: I0702af4b8af6fc934b98359eb85c99ded918f17a