am d4e9f076: Merge "Clean up linker architecture macros."

* commit 'd4e9f076d621dcf6450acba178e65d63c076ae6e':
  Clean up linker architecture macros.