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

Change-Id: I874da9662bf638415b05be27bff04abed30798d8