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

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