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