Merge "Fix soname reading code."