Merge "Reland "Bionic libs are located at /system/lib""" am: ca13323b6f
am: effa936a7b

Change-Id: I1d6079deea85a5abd01c723a29e9256ed594718d