Issue #26851: Merge 3.6.

diff --cc Misc/NEWS
index a381b313028727c96b46689d0a9510538f89a8e6,0a32e264b6caaf18cc623d8d40d0e775ae8c4236..550dc76802e8a97c69e6b9dc05fdca018a6d8fd9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -576,107 -106,6 +576,109 @@@ C AP
    available only when Py_LIMITED_API is set to the PY_VERSION_HEX value of
    the minimum Python version supporting this API.
  
 +- Issue #28822: The indices parameters *start* and *end* of PyUnicode_FindChar()
 +  are now adjusted to behave like ``str[start:end]``.
 +
 +- Issue #28808: PyUnicode_CompareWithASCIIString() now never raises exceptions.
 +
 +- Issue #28761: The fields name and doc of structures PyMemberDef, PyGetSetDef,
 +  PyStructSequence_Field, PyStructSequence_Desc, and wrapperbase are now of
 +  type ``const char *`` rather of ``char *``.
 +
 +- Issue #28748: Private variable _Py_PackageContext is now of type ``const char *``
 +  rather of ``char *``.
 +
 +- Issue #19569: Compiler warnings are now emitted if use most of deprecated
 +  functions.
 +
 +- Issue #28426: Deprecated undocumented functions PyUnicode_AsEncodedObject(),
 +  PyUnicode_AsDecodedObject(), PyUnicode_AsDecodedUnicode() and
 +  PyUnicode_AsEncodedUnicode().
 +
 +Documentation
 +-------------
 +
 +- Issue #23722: The data model reference and the porting section in the
 +  3.6 What's New guide now cover the additional ``__classcell__`` handling
 +  needed for custom metaclasses to fully support PEP 487 and zero-argument
 +  ``super()``.
 +
 +- Issue #28513: Documented command-line interface of zipfile.
 +
 +Build
 +-----
 +
++- Issue #26851: Set Android compilation and link flags.
++
 +- Issue #28768: Fix implicit declaration of function _setmode. Patch by
 +  Masayuki Yamamoto
 +
 +- Issue #29080: Removes hard dependency on hg.exe from PCBuild/build.bat
 +
 +- Issue #23903: Added missed names to PC/python3.def.
 +
 +- Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
 +  macro is not defined in android-ndk-r13.
 +
 +- Issue #28538: Fix the compilation error that occurs because if_nameindex() is
 +  available on Android API level 24, but the if_nameindex structure is not
 +  defined.
 +
 +- Issue #20211: Do not add the directory for installing C header files and the
 +  directory for installing object code libraries to the cross compilation
 +  search paths. Original patch by Thomas Petazzoni.
 +
 +- 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.
 +
 +- Issue #26661: setup.py now detects system libffi with multiarch wrapper.
 +
 +- Issue #27979: A full copy of libffi is no longer bundled for use when
 +  building _ctypes on non-OSX UNIX platforms.  An installed copy of libffi is
 +  now required when building _ctypes on such platforms.
 +
 +- Issue #15819: Remove redundant include search directory option for building
 +  outside the source tree.
 +
 +- Issue #28676: Prevent missing 'getentropy' declaration warning on macOS.
 +  Patch by Gareth Rees.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #28023: Fix python-gdb.py didn't support new dict implementation.
 +
 +- Issue #15369: The pybench and pystone microbenchmark have been removed from
 +  Tools. Please use the new Python benchmark suite
 +  https://github.com/python/performance which is more reliable and includes a
 +  portable version of pybench working on Python 2 and Python 3.
 +
 +- Issue #28102: The zipfile module CLI now prints usage to stderr.
 +  Patch by Stephen J. Turnbull.
 +
  Tests
  -----
  

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge