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

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