am f87ef8c8: Merge "Improve heap verification for invalid roots."

* commit 'f87ef8c82433626805c6e8183bb2622805976a94':
  Improve heap verification for invalid roots.