Issue 28668: Merge 3.5

diff --cc Lib/test/support/__init__.py
index d862d8b457d81fbc6ae15ed83b806343be6e3605,09095db265ab40eb3220ab076c0bcfeab25e8821..81136100f03c511de59399bb4c119bc4fd456c06
--- 1/Lib/test/support/__init__.py
--- 2/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@@ -90,9 -89,9 +90,9 @@@ __all__ = 
      "bigmemtest", "bigaddrspacetest", "cpython_only", "get_attribute",
      "requires_IEEE_754", "skip_unless_xattr", "requires_zlib",
      "anticipate_failure", "load_package_tests", "detect_api_mismatch",
-     "check__all__", "requires_android_level",
 -     "requires_multiprocessing_queue",
++    "check__all__", "requires_android_level", "requires_multiprocessing_queue",
      # sys
 -    "is_jython", "check_impl_detail",
 +    "is_jython", "is_android", "check_impl_detail", "unix_shell",
      # network
      "HOST", "IPV6_ENABLED", "find_unused_port", "bind_port", "open_urlresource",
      # processes

diff --cc Lib/test/test_logging.py
Simple merge