Merge "Replace public library list with shared lib sonames" am: fd87c062ab
am: e6050e248a

Change-Id: I0adba2c954625fe711ce4eb2a54ee482a7bd563d