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

Change-Id: Ibc0f2ae148232a7ec06fefb55f43ff65495b5004