[automerger skipped] Merge "Make shared library dependencies explicit in SharedLibraryInfo" am: 550b5e68c1 am: a835f23f47
am: ec901b3133  -s ours

Change-Id: I86b8ca06ddbfd79e71ffb09b15ce7a331347af63