Merge "Fix MIPS build"