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

* commit '8e83853ccee319d3472662550889a80c81799c30':
  [WIP] Fix a rosalloc verification crash.