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

Change-Id: Iac543521ec34db809ce5b0612885450c21b6707d