[automerger skipped] Merge "Attach SharedLibraryInfo to a Package." am: 711941c64d am: 11717b1950
am: bd1945bced  -s ours

Change-Id: If36e70e4277888101b9ae33e87b888f04f18315a