am cf8e554c: (-s ours) Merge "Make the linker relocatable."

* commit 'cf8e554c72af1dd634d4f36a9065e34e853f8714':
  Make the linker relocatable.