Merge "Make shared library dependencies explicit in SharedLibraryInfo"