Merge "Migrated dumpstate to C++."
am: 1f62517b36

* commit '1f62517b3654a3c0e95ea4d5b3664fac8115acdf':
  Migrated dumpstate to C++.