am 48aba684: Merge "Fix register allocator test."

* commit '48aba6847270221c3f189732ecc69a0258d3aaca':
  Fix register allocator test.