Merge changes Ib3ea4221,Idb462d69

* changes:
  More robust handling of iptables-restore process termination
  Revert "Revert "Move createChildChains to iptables-restore.""
tree: 015d4fd2fb95913a703e47cbcbb0c3dcea1cfb1c
  1. client/
  2. include/
  3. server/
  4. tests/
  5. Android.mk
  6. MODULE_LICENSE_APACHE2
  7. NOTICE