am c7f6b86c: Merge "Fix bug in register allocator."

* commit 'c7f6b86c269727fe031146b9c18652d40916d46f':
  Fix bug in register allocator.