am 66c2a976: Merge change 24762 into eclair

Merge commit '66c2a976705b62fe1721157e934b52d4a49de8f7' into eclair-plus-aosp

* commit '66c2a976705b62fe1721157e934b52d4a49de8f7':
  dumpstate: Switch back to running as non-root

cmds/dumpstate/dumpstate.c

@@ -216,11 +216,9 @@ int main(int argc, char *argv[]) {
     } else
         vibrate_fd = -1;
 
-#if 0
     /* switch to non-root user and group */
     setgroups(sizeof(groups)/sizeof(groups[0]), groups);
     setuid(AID_SHELL);
-#endif
 
     /* make it safe to use both printf and STDOUT_FILENO */ 
     setvbuf(stdout, 0, _IONBF, 0);