diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure gdb-7.12.1/gdb/gdbserver/configure
--- gdb-7.12.1.orig/gdb/gdbserver/configure	2017-05-14 17:02:46.742711695 -0700
+++ gdb-7.12.1/gdb/gdbserver/configure	2017-05-14 17:03:22.147058607 -0700
@@ -6671,17 +6671,6 @@ fi
 
 
 case "${target}" in
-  *-android*)
-    # Starting with NDK version 9, <elf.h> actually includes definitions
-    # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes
-    # <sys/exec_elf.h> which defines some of the ELF types incorrectly,
-    # leading to conflicts with the defintions from <linux/elf.h>.
-    # This makes it impossible for us to include both <elf.h> and
-    # <linux/elf.h>, which means that, in practice, we do not have
-    # access to Elf32_auxv_t and Elf64_auxv_t on this platform.
-    # Therefore, do not try to auto-detect availability, as it would
-    # get it wrong on this platform.
-    ;;
   *)
     ac_fn_c_check_type "$LINENO" "Elf32_auxv_t" "ac_cv_type_Elf32_auxv_t" "#include <elf.h>
 
diff -urpN gdb-7.12.1.orig/gdb/gdbserver/configure.ac gdb-7.12.1/gdb/gdbserver/configure.ac
--- gdb-7.12.1.orig/gdb/gdbserver/configure.ac	2017-05-14 17:02:46.742711695 -0700
+++ gdb-7.12.1/gdb/gdbserver/configure.ac	2017-05-14 17:03:53.219361720 -0700
@@ -179,17 +179,6 @@ AC_CHECK_TYPES(socklen_t, [], [],
 ])
 
 case "${target}" in
-  *-android*)
-    # Starting with NDK version 9, <elf.h> actually includes definitions
-    # of Elf32_auxv_t and Elf64_auxv_t. But sadly, <elf.h> includes
-    # <sys/exec_elf.h> which defines some of the ELF types incorrectly,
-    # leading to conflicts with the defintions from <linux/elf.h>.
-    # This makes it impossible for us to include both <elf.h> and
-    # <linux/elf.h>, which means that, in practice, we do not have
-    # access to Elf32_auxv_t and Elf64_auxv_t on this platform.
-    # Therefore, do not try to auto-detect availability, as it would
-    # get it wrong on this platform.
-    ;;
   *)
     AC_CHECK_TYPES([Elf32_auxv_t, Elf64_auxv_t], [], [],
     #include <elf.h>