Merge "Fix CFI fixups for long branches on MIPS."