Merge "Bionic libs are located at /system/lib" am: e7bd7aa01c
am: c07ff93e11

Change-Id: Ife6b87c8010ef2f3e8f93841cb9268fd6af48edc