Merge "Revert "Fix shared libraries not being reported via Reporter""