Merge "Fix mips and x86 builds"