am 9b996f80: am eb9b62e0: Merge "Make -rpath-link work with multilib."

* commit '9b996f80a95f48bae153c35bacc0360c004e5258':
  Make -rpath-link work with multilib.