diff -r eee959fee5f5 Modules/socketmodule.c
--- a/Modules/socketmodule.c	Sat May 07 21:13:50 2016 +0300
+++ b/Modules/socketmodule.c	Tue May 10 17:59:07 2016 +0200
@@ -163,10 +163,17 @@
 # include <sys/uio.h>
 #endif
 
-#if !defined(WITH_THREAD) || defined(__ANDROID__)
+#ifdef WITH_THREAD
 # undef HAVE_GETHOSTBYNAME_R
 #endif
 
+#ifdef __ANDROID__
+# include <android/api-level.h>
+# if __ANDROID_API__ < 23
+#  undef HAVE_GETHOSTBYNAME_R
+# endif
+#endif
+
 #ifdef HAVE_GETHOSTBYNAME_R
 # if defined(_AIX)
 #  define HAVE_GETHOSTBYNAME_R_3_ARG