Merge "Fix a bug in the register allocator around pair allocation."