Move linux/ headers down in test_android

This moves the linux/ headers after others
This keeps the Android tests closer to the Linux ones.
I think this is needed to get linux/errqueue.h to not cause compilation
failures.

Author: mcpherrinm

libc-test/build.rs

@@ -1235,7 +1235,6 @@ fn test_android(target: &str) {
 
     headers! { cfg:
                "arpa/inet.h",
-               "asm/mman.h",
                "ctype.h",
                "dirent.h",
                "dlfcn.h",
@@ -1244,27 +1243,6 @@ fn test_android(target: &str) {
                "grp.h",
                "ifaddrs.h",
                "limits.h",
-               "linux/dccp.h",
-               "linux/futex.h",
-               "linux/fs.h",
-               "linux/genetlink.h",
-               "linux/if_alg.h",
-               "linux/if_ether.h",
-               "linux/if_tun.h",
-               "linux/magic.h",
-               "linux/memfd.h",
-               "linux/module.h",
-               "linux/net_tstamp.h",
-               "linux/netfilter/nfnetlink.h",
-               "linux/netfilter/nfnetlink_log.h",
-               "linux/netfilter/nf_tables.h",
-               "linux/netfilter_ipv4.h",
-               "linux/netfilter_ipv6.h",
-               "linux/netlink.h",
-               "linux/quota.h",
-               "linux/reboot.h",
-               "linux/seccomp.h",
-               "linux/sockios.h",
                "locale.h",
                "malloc.h",
                "net/ethernet.h",
@@ -1335,6 +1313,33 @@ fn test_android(target: &str) {
                [x86]: "sys/reg.h",
     }
 
+    // Include linux headers at the end:
+    headers! { cfg:
+               "asm/mman.h",
+               "linux/dccp.h",
+               "linux/futex.h",
+               "linux/fs.h",
+               "linux/genetlink.h",
+               "linux/if_alg.h",
+               "linux/if_ether.h",
+               "linux/if_tun.h",
+               "linux/magic.h",
+               "linux/memfd.h",
+               "linux/module.h",
+               "linux/net_tstamp.h",
+               "linux/netfilter/nfnetlink.h",
+               "linux/netfilter/nfnetlink_log.h",
+               "linux/netfilter/nf_tables.h",
+               "linux/netfilter_ipv4.h",
+               "linux/netfilter_ipv6.h",
+               "linux/netlink.h",
+               "linux/quota.h",
+               "linux/reboot.h",
+               "linux/seccomp.h",
+               "linux/sockios.h",
+
+   }
+
     cfg.type_name(move |ty, is_struct, is_union| {
         match ty {
             // Just pass all these through, no need for a "struct" prefix