Merge "Revert "Bionic libs are located at /system/lib"" am: 87fe485bfa
am: 9997837304

Change-Id: I7c517cd8e29588b90b4e6052d62fbc5f820cb185