am 06713930: Merge "Small cleanup of soinfo_elf_lookup."

* commit '0671393072a78e75a726c58aa3ca718e55eeac3e':
  Small cleanup of soinfo_elf_lookup.