am 0c8f415f: Merge "Fix heap verification and add runtime options."

* commit '0c8f415f06e4bfe64552297cd1cc50f5709ffb59':
  Fix heap verification and add runtime options.