am b32cc032: Merge "Use arch-specific variable to set up the x86 ld flags."

* commit 'b32cc032030e7a9f50b28d6dba5a40a38e6e76cf':
  Use arch-specific variable to set up the x86 ld flags.