Merge commit 'bc06c07ee7677168d71a9c809a8960f39340ff99' into blah

Change-Id: I6cbd56cd2ee42de56736642e617689c412056e42

diff --cc cmds/dumpstate/dumpstate.cpp
Simple merge

diff --cc cmds/dumpstate/utils.cpp
index cad7809,5527b24..0d9cce2
--- 1/cmds/dumpstate/utils.cpp
--- 2/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@@ -828,7 -828,8 +828,8 @@@ bool drop_root_user() 
      }
  
      gid_t groups[] = { AID_LOG, AID_SDCARD_R, AID_SDCARD_RW,
-             AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC, AID_WAKELOCK };
 -            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC,
++            AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC, AID_WAKELOCK,
+             AID_BLUETOOTH };
      if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
          MYLOGE("Unable to setgroups, aborting: %s\n", strerror(errno));
          return false;