Merge "Make -rpath-link work with multilib."