am 4403b087: Merge "Fix register_allocator_test after reg alloc changes."

* commit '4403b08717af2fe476e933c8cb69f53fe37a6c5a':
  Fix register_allocator_test after reg alloc changes.