Merge "Fix a use of OpCondBranch that breaks the MIPS build."