Merge "Reland "Fix shared libraries not being reported""