Merge \"Run iptables as root.\" into nyc-dev

am: ab69cc1f11

Change-Id: I4ca2677e7b99cfaa1ccc60c3efb2df642f3a7408

diff --cc cmds/dumpstate/dumpstate.cpp
index f950f4d,5fe1f90..13b9cd7
--- 1/cmds/dumpstate/dumpstate.cpp
--- 2/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@@ -1345,11 -1286,8 +1345,12 @@@ int main(int argc, char *argv[]) 
      add_dir(RECOVERY_DIR, true);
      add_dir(RECOVERY_DATA_DIR, true);
      add_dir(LOGPERSIST_DATA_DIR, false);
 +    if (!is_user_build()) {
 +        add_dir(PROFILE_DATA_DIR_CUR, true);
 +        add_dir(PROFILE_DATA_DIR_REF, true);
 +    }
      add_mountinfo();
+     dump_iptables();
  
      if (!drop_root_user()) {
          return -1;