Issue #28849: Merge 3.6.

diff --cc Lib/test/test_sysconfig.py
index d2aa8b4d611d3926e7c91584cd5a1ed294eab70a,747b2e5815f50c93f06f9c3ffba2331b95847397..a3baea86fe596292c347a989554c477cd7d51d48
--- 1/Lib/test/test_sysconfig.py
--- 2/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@@ -385,10 -385,10 +385,11 @@@ class TestSysConfig(unittest.TestCase)
          self.assertIsNotNone(vars['SO'])
          self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
  
-     @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test')
+     @unittest.skipUnless(hasattr(sys.implementation, '_multiarch'),
+                          'multiarch-specific test')
      def test_triplet_in_ext_suffix(self):
 -        import ctypes, platform, re
 +        ctypes = import_module('ctypes')
 +        import platform, re
          machine = platform.machine()
          suffix = sysconfig.get_config_var('EXT_SUFFIX')
          if re.match('(aarch64|arm|mips|ppc|powerpc|s390|sparc)', machine):

diff --cc Misc/NEWS
index 73587133885a1074aca0287de1384351c084766e,5c323a1038d1e0ea00794bc5e2c62ea7e9d46c35..846b394090103f6eb2d1be878c74e516253645d2
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -528,27 -613,6 +528,29 @@@ Documentatio
  Build
  -----
  
++- Issue #28849: Do not define sys.implementation._multiarch on Android.
++
 +- Issue #10656: Fix out-of-tree building on AIX.  Patch by Tristan Carel and
 +  Michael Haubenwallner.
 +
 +- Issue #26359: Rename --with-optimiations to --enable-optimizations.
 +
 +- Issue #28444: Fix missing extensions modules when cross compiling.
 +
 +- Issue #28208: Update Windows build and OS X installers to use SQLite 3.14.2.
 +
 +- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
 +
 +- Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``
 +  instead of ``&PyType_Type`` to PyVarObject_HEAD_INIT.  Patch by Masayuki
 +  Yamamoto.
 +
 +- Issue #13756: Fix building extensions modules on Cygwin.  Patch by Roumen
 +  Petrov, based on original patch by Jason Tishler.
 +
 +- Issue #21085: Add configure check for siginfo_t.si_band, which Cygwin does
 +  not provide.  Patch by Masayuki Yamamoto with review and rebase by Erik Bray.
 +
  - Issue #28258: Fixed build with Estonian locale (python-config and distclean
    targets in Makefile).  Patch by Arfrever Frehtes Taifersar Arahesis.
  

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge