Merge "Migrated dumpstate to C++."
am: 2b3472f625

* commit '2b3472f6257c8742a2904d566d436b611f3f3900':
  Migrated dumpstate to C++.