Merge "Replace public library list with shared lib sonames"