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

* commit '876a52a10e97d3c58e5b3782348886dedb74f086':
  Fix register allocator test.