Merge "x86 build fix."