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

Change-Id: Id504b70e5c175dbe367439750c4c78edc8c12dd4