am 81bfade8: am 06713930: Merge "Small cleanup of soinfo_elf_lookup."

* commit '81bfade818f1b76cf822f0e7e0862fe61e7c580a':
  Small cleanup of soinfo_elf_lookup.