Merge "Fix shared libraries not being reported via Reporter" am: 3098ae7952

Change-Id: Ie2b225f65418e971bf024c2b12364ed59fff62a9