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

Change-Id: Ie773537bc0d042e0ad557d0b36651bd8a8a74ebd