Issue #28759: Merge 3.6.

diff --cc Lib/test/support/__init__.py
index 6df48c0fed0761a15f9fcb15d432b6a8a2c25b41,ed1af2b5a5d3d686f979d9e5b93d813b592dede7..bed76eb103386bd6f2335c1a496d9d79cf88d0db
--- 1/Lib/test/support/__init__.py
--- 2/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@@ -767,13 -767,9 +767,14 @@@ requires_lzma = unittest.skipUnless(lzm
  
  is_jython = sys.platform.startswith('java')
  
 -_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL')
 -is_android = (_ANDROID_API_LEVEL is not None and _ANDROID_API_LEVEL > 0)
 +try:
 +    # constant used by requires_android_level()
 +    _ANDROID_API_LEVEL = sys.getandroidapilevel()
 +    is_android = True
 +except AttributeError:
 +    # sys.getandroidapilevel() is only available on Android
 +    is_android = False
+ android_not_root = (is_android and os.geteuid() != 0)
  
  if sys.platform != 'win32':
      unix_shell = '/system/bin/sh' if is_android else '/bin/sh'