Merge "Make shared library dependencies explicit in SharedLibraryInfo" am: 550b5e68c1
am: a835f23f47

Change-Id: I63fc21a422d00a38f15116c06af9b1342d36f773