am 313c9c64: Merge "[WIP] Fix a rosalloc verification crash."

* commit '313c9c6413b78e0f9ed791ce079490423872c2d8':
  [WIP] Fix a rosalloc verification crash.