Merge "Bionic libs are explicitly added to runtime APEX" am: 2da5ebf382
am: 0fb6b79b55

Change-Id: I9f252a799a58010ca310cf568ccbf58c598536c9