Merge "Fix x86 builds"