am dfae5e62: Merge "Pass linker patches around as const."

* commit 'dfae5e62f917b9a9ec38ebd536813a884c508eac':
  Pass linker patches around as const.