am 6a5f5b25: Merge "Fix a bug in the register allocator."

* commit '6a5f5b25b3866966175859bc20216c5519d8b029':
  Fix a bug in the register allocator.