Merge "Fix mips build after sharpening change."