am 3a91e906: Merge "Fix a rosalloc check failure in a test."

* commit '3a91e9061c985c156f1a5a17b2159bf9013629c8':
  Fix a rosalloc check failure in a test.