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

* commit '4e16a77f071c5b41ccf1e418c0bd5b374c5f0f8b':
  Improve heap verification for invalid roots.