Merge "Fix x86 build."