am f3ffb8fa: am 78129204: Merge "Clean up the linker a bit, remove prelinking support."

* commit 'f3ffb8fa6ecd9db2da19eb3144a5da7724a875bc':
  Clean up the linker a bit, remove prelinking support.