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

Change-Id: Id2aacacd76929d23bb87054e6c5ddd646be25748