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

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