Merge "Fix a rosalloc check failure in a test."