Merge "Revert "Fix shared libraries not being reported via Reporter"" am: 23dde6accb

Change-Id: I93292050f45e6fe8e91fba33266a7b3f8ac80970