Merge "Fix mips build"