am 421e911a: Merge "Simplify defining the linker architecture macro."

* commit '421e911a0bebd24bf197b092d17a3000cfec2c15':
  Simplify defining the linker architecture macro.