Merge "Fix soname reading code."
am: 76eda07ff6

Change-Id: I659a84ac44940ac38a8d31f9a5c3cb102435da07