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

Change-Id: Ib6f7bbefed0ff9897d80479308c3724954d42e26