resolve merge conflicts of 7a52b75 to nyc-dev-plus-aosp

Change-Id: Ic895408a1ecd4ec0d15ae06ec81029e79b67bbd7

diff --cc cmds/dumpstate/dumpstate.cpp
index 2873e40,6b8ca57..2ba9780
--- 1/cmds/dumpstate/dumpstate.cpp
--- 2/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@@ -649,12 -429,9 +649,13 @@@ static void dumpstate(const std::string
      dump_file("KERNEL CPUFREQ", "/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state");
      dump_file("KERNEL SYNC", "/d/sync");
  
-     run_command("PROCESSES AND THREADS", 10, "ps", "-Z", "-t", "-p", "-P", NULL);
+     run_command("PROCESSES AND THREADS", 10, "toybox", "ps", "-A", "-T", "-Z",
+                 "-O", "pri,nice,rtprio,sched,pcy", NULL);
 -    run_command("LIBRANK", 10, "librank", NULL);
 +    run_command("LIBRANK", 10, SU_PATH, "root", "librank", NULL);
 +
 +    run_command("PRINTENV", 10, "printenv", NULL);
 +    run_command("NETSTAT", 10, "netstat", "-n", NULL);
 +    run_command("LSMOD", 10, "lsmod", NULL);
  
      do_dmesg();