Merge "Bionic libs are located at /system/lib"
am: e7bd7aa01c

Change-Id: I7ed570e038d05d151e1ed9c2aeb5f2574582ddfd