Merge "Revert "Bionic libs are located at /system/lib""