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

Change-Id: I6c3578920711e16f28a04305bc12c02db905bf3e