Merge "Fix mips/mips64 build"