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

Change-Id: I8f3bc9e8d92f715eabb9362edd877015982bd16c