Merge "Add "ip xfrm policy" to dumpstate output"

diff --cc cmds/dumpstate/dumpstate.cpp
index 637b784,14e8d85..264251d
--- 1/cmds/dumpstate/dumpstate.cpp
--- 2/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@@ -844,16 -853,15 +844,16 @@@ static bool add_text_zip_entry(const st
  static void dump_iptables() {
      RunCommand("IPTABLES", {"iptables", "-L", "-nvx"});
      RunCommand("IP6TABLES", {"ip6tables", "-L", "-nvx"});
-     RunCommand("IPTABLE NAT", {"iptables", "-t", "nat", "-L", "-nvx"});
+     RunCommand("IPTABLES NAT", {"iptables", "-t", "nat", "-L", "-nvx"});
      /* no ip6 nat */
-     RunCommand("IPTABLE MANGLE", {"iptables", "-t", "mangle", "-L", "-nvx"});
-     RunCommand("IP6TABLE MANGLE", {"ip6tables", "-t", "mangle", "-L", "-nvx"});
-     RunCommand("IPTABLE RAW", {"iptables", "-t", "raw", "-L", "-nvx"});
-     RunCommand("IP6TABLE RAW", {"ip6tables", "-t", "raw", "-L", "-nvx"});
+     RunCommand("IPTABLES MANGLE", {"iptables", "-t", "mangle", "-L", "-nvx"});
+     RunCommand("IP6TABLES MANGLE", {"ip6tables", "-t", "mangle", "-L", "-nvx"});
+     RunCommand("IPTABLES RAW", {"iptables", "-t", "raw", "-L", "-nvx"});
+     RunCommand("IP6TABLES RAW", {"ip6tables", "-t", "raw", "-L", "-nvx"});
  }
  
 -static void dumpstate(const std::string& screenshot_path, const std::string& version) {
 +static void dumpstate(const std::string& screenshot_path,
 +                      const std::string& version __attribute__((unused))) {
      DurationReporter durationReporter("DUMPSTATE");
      unsigned long timeout;