Merge "Fix shared libraries not being reported via Reporter"