Merge "Switch to more conventional ps arguments in dumpstate."
am: 90c04fe679

* commit '90c04fe6791b619be58d13d785a1fbe8f35a45ab':
  Switch to more conventional ps arguments in dumpstate.

Change-Id: I181c915cb4604bcaef1e613784cd2c1dd1427085