diff -r 7efddbf1aa70 Lib/test/test_sysconfig.py
--- a/Lib/test/test_sysconfig.py	Tue Nov 29 18:47:56 2016 +0100
+++ b/Lib/test/test_sysconfig.py	Wed Nov 30 17:28:38 2016 +0100
@@ -6,7 +6,8 @@
 from copy import copy
 
 from test.support import (import_module, TESTFN, unlink, check_warnings,
-                          captured_stdout, skip_unless_symlink, change_cwd)
+                          captured_stdout, skip_unless_symlink, change_cwd,
+                          is_android)
 
 import sysconfig
 from sysconfig import (get_paths, get_platform, get_config_vars,
@@ -386,6 +387,7 @@
         self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
 
     @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test')
+    @unittest.skipIf(is_android, 'Android is not a multiarch system')
     def test_triplet_in_ext_suffix(self):
         ctypes = import_module('ctypes')
         import platform, re
@@ -396,7 +398,6 @@
         if re.match('(i[3-6]86|x86_64)$', machine):
             if ctypes.sizeof(ctypes.c_char_p()) == 4:
                 self.assertTrue(suffix.endswith('i386-linux-gnu.so') or
-                                suffix.endswith('i686-linux-android.so') or
                                 suffix.endswith('x86_64-linux-gnux32.so'),
                                 suffix)
             else: # 8 byte pointer size
diff -r 7efddbf1aa70 Makefile.pre.in
--- a/Makefile.pre.in	Tue Nov 29 18:47:56 2016 +0100
+++ b/Makefile.pre.in	Wed Nov 30 17:28:38 2016 +0100
@@ -1301,8 +1301,12 @@
 			esac; \
 		done; \
 	done
-	$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
-		$(DESTDIR)$(LIBDEST); \
+	if test -z "$(MULTIARCH)"; then \
+			sysconfigdata=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP) ; \
+		else \
+			sysconfigdata=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) ; \
+		fi ; \
+		$(INSTALL_DATA) `cat pybuilddir.txt`/$$sysconfigdata.py $(DESTDIR)$(LIBDEST)
 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
 	if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
@@ -1436,7 +1440,12 @@
 		--install-scripts=$(BINDIR) \
 		--install-platlib=$(DESTSHARED) \
 		--root=$(DESTDIR)/
-	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
+	-if test -z "$(MULTIARCH)"; then \
+			sysconfigdata=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP) ; \
+		else \
+			sysconfigdata=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) ; \
+		fi ; \
+		rm $(DESTDIR)$(DESTSHARED)/$$sysconfigdata.py
 	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
 
 # Here are a couple of targets for MacOSX again, to install a full
diff -r 7efddbf1aa70 configure.ac
--- a/configure.ac	Tue Nov 29 18:47:56 2016 +0100
+++ b/configure.ac	Wed Nov 30 17:28:38 2016 +0100
@@ -770,29 +770,7 @@
 #undef sparc
 #undef unix
 #if defined(__ANDROID__)
-# if defined(__x86_64__) && defined(__LP64__)
-        x86_64-linux-android
-# elif defined(__i386__)
-        i686-linux-android
-# elif defined(__aarch64__) && defined(__AARCH64EL__)
-#  if defined(__ILP32__)
-        aarch64_ilp32-linux-android
-#  else
-        aarch64-linux-android
-#  endif
-# elif defined(__ARM_EABI__) && defined(__ARMEL__)
-        arm-linux-androideabi
-# elif defined(__mips_hard_float) && defined(_MIPSEL)
-#  if _MIPS_SIM == _ABIO32
-        mipsel-linux-android
-#  elif _MIPS_SIM == _ABI64
-        mips64el-linux-android
-#  else
-#   error unknown platform triplet
-#  endif
-# else
-#   error unknown platform triplet
-# endif
+    # Android is not a multiarch system.
 #elif defined(__linux__)
 # if defined(__x86_64__) && defined(__LP64__)
         x86_64-linux-gnu