Add MULTIARCH detection for android targets in configure.ac.

configure.ac

@@ -738,10 +738,10 @@ fi
 
 AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
 cat >> conftest.c <<EOF
-#if __has_include(<features.h>)
+#if !defined(__ANDROID__) && __has_include(<features.h>)
 #include <features.h>
 #endif
-#if __has_include(<TargetConditionals.h>)
+#if defined(__APPLE__) && __has_include(<TargetConditionals.h>)
 #include <TargetConditionals.h>
 #endif
 #undef bfin
@@ -756,7 +756,27 @@ cat >> conftest.c <<EOF
 #undef sparc
 #undef unix
 #if defined(__ANDROID__)
-    # Android is not a multiarch system.
+# if defined(__aarch64__)
+        aarch64-linux-android
+# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
+#  if defined(__ARMEL__)
+        arm-linux-androideabihf
+#  else
+        armeb-linux-androideabihf
+#  endif
+# elif defined(__nocona__)
+        i786-linux-android
+# elif defined(__i686__)
+        i686-linux-android
+# elif defined(__i586__)
+        i586-linux-android
+# elif defined(__i486__)
+        i486-linux-android
+# elif defined(__i386__)
+        i386-linux-android
+# elif defined(__x86_64__)
+        x86_64-linux-android
+# endif
 #elif defined(__linux__) && !defined(__GLIBC__)
 # if defined(__aarch64__)
         aarch64-linux-musl