Merge "Fix mips64 cfi test"