am 86f594b1: Merge "Encapsulate soinfo_link_image and soinfo_relocate"

* commit '86f594b19bc51ffe87bfacb6b42687af94c3c648':
  Encapsulate soinfo_link_image and soinfo_relocate