Merge "Fix shared libraries not being reported via Reporter" am: 3098ae7952 am: ef5ce9baec

Change-Id: Icd2a7ba53b0de387deb031a448003a10729cee7f