Merge "Switch to more conventional ps arguments in dumpstate."