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

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