Merge "Fix register_allocator_test after reg alloc changes."