Merge "Fix x86 master build failure."