Merge "Reland "Fix shared libraries not being reported"" am: 257fef3fe3 am: 240c7416b2

Change-Id: I45c64d94b9f17428c7155546d737f523c6c6efe7