resolved conflicts for merge of 5b49ab9e to master

Change-Id: Ib252e3630c5e3b8a38405fc33b147ad365492946

diff --cc CommandListener.cpp
Simple merge

diff --cc NatController.cpp
Simple merge

diff --cc NatController.h
index 52a1627,5f45376..cf059e1
--- 1/NatController.h
--- 2/NatController.h
+++ b/NatController.h
@@@ -18,9 -18,9 +18,10 @@@
  #define _NAT_CONTROLLER_H
  
  #include <linux/in.h>
 +#include <list>
  
- #include "SecondaryTableController.h"
+ class NetworkController;
+ class SecondaryTableController;
  
  class NatController {
  
@@@ -36,15 -36,11 +37,16 @@@ public
      static const char* LOCAL_NAT_POSTROUTING;
      static const char* LOCAL_TETHER_COUNTERS_CHAIN;
  
 +    // List of strings of interface pairs.
 +    std::list<std::string> ifacePairList;
 +
  private:
      int natCount;
-     SecondaryTableController *secondaryTableCtrl;
+     SecondaryTableController *mSecondaryTableCtrl;
+     NetworkController *mNetCtrl;
  
 +    bool checkTetherCountingRuleExist(const char *pair_name);
 +
      int setDefaults();
      int runCmd(int argc, const char **argv);
      bool checkInterface(const char *iface);