Merge "fix x86 build"