Clatd changes for move of libipchecksum.

libipchecksum is becoming its own library in
frameworks/libs/net and its include files are no longer under
netutils/. Adjust clatd code accordingly.

Also reorder some include files as suggested by clang-format.

Test: m
Test: atest clatd_test
Test: connects to IPv6-only wifi, testipv4.com shows 10/10
Change-Id: I5e4c73065ce828123aef7e8851227f9bdf444ff9

Android.bp

@@ -66,7 +66,7 @@ cc_binary {
         "main.c"
     ],
     static_libs: [
-        "libipchecksum",
+        "libip_checksum",
         "libnl",
     ],
     shared_libs: [
@@ -106,7 +106,7 @@ cc_test {
     ],
     static_libs: [
         "libbase",
-        "libipchecksum",
+        "libip_checksum",
         "libnetd_test_tun_interface",
         "libnl",
     ],

clatd_test.cpp

@@ -30,10 +30,10 @@
 #include "tun_interface.h"
 
 extern "C" {
+#include "checksum.h"
 #include "clatd.h"
 #include "config.h"
 #include "getaddr.h"
-#include "netutils/checksum.h"
 #include "translate.h"
 }
 

dump.c

@@ -15,9 +15,7 @@
  *
  * dump.c - print various headers for debugging
  */
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "dump.h"
 
 #include <arpa/inet.h>
 #include <linux/icmp.h>
@@ -29,12 +27,13 @@
 #include <netinet/ip_icmp.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-#include "netutils/checksum.h"
-
+#include "checksum.h"
 #include "clatd.h"
 #include "debug.h"
-#include "dump.h"
 #include "logging.h"
 
 #if CLAT_DEBUG

ipv4.c

@@ -17,8 +17,7 @@
  */
 #include <string.h>
 
-#include "netutils/checksum.h"
-
+#include "checksum.h"
 #include "debug.h"
 #include "dump.h"
 #include "logging.h"

ipv6.c

@@ -15,12 +15,10 @@
  *
  * ipv6.c - takes ipv6 packets, finds their headers, and then calls translation functions on them
  */
+#include <arpa/inet.h>
 #include <string.h>
 
-#include <arpa/inet.h>
-
-#include "netutils/checksum.h"
-
+#include "checksum.h"
 #include "config.h"
 #include "debug.h"
 #include "dump.h"

translate.c

@@ -15,17 +15,17 @@
  *
  * translate.c - CLAT functions / partial implementation of rfc6145
  */
+#include "translate.h"
+
 #include <string.h>
 
-#include "netutils/checksum.h"
-
+#include "checksum.h"
 #include "clatd.h"
 #include "common.h"
 #include "config.h"
 #include "debug.h"
 #include "icmp.h"
 #include "logging.h"
-#include "translate.h"
 
 /* function: packet_checksum
  * calculates the checksum over all the packet components starting from pos