Merge from 3.4 (for #21499).

diff --cc Misc/NEWS
index 4ccc40bbe6e3d925f7b4ce9917b792a65be6933e,f85155e0bc3a5e013c057bda610c88bb0d248de4..787239bdc07625334762344d058e571e8ad41931
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -272,24 -187,8 +272,26 @@@ Librar
  
  - Issue #20884: Don't assume that __file__ is defined on importlib.__init__.
  
+ - Issue #21499: Ignore __builtins__ in several test_importlib.test_api tests.
+ 
 +- Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
 +
 +- Issue #19165: The formatter module now raises DeprecationWarning instead of
 +  PendingDeprecationWarning.
 +
 +- Issue #13936: Remove the ability of datetime.time instances to be considered
 +  false in boolean contexts.
 +
 +- Issue 18931: selectors module now supports /dev/poll on Solaris.
 +  Patch by Giampaolo Rodola'.
 +
 +- Issue #19977: When the ``LC_TYPE`` locale is the POSIX locale (``C`` locale),
 +  :py:data:`sys.stdin` and :py:data:`sys.stdout` are now using the
 +  ``surrogateescape`` error handler, instead of the ``strict`` error handler.
 +
 +- Issue #20574: Implement incremental decoder for cp65001 code (Windows code
 +  page 65001, Microsoft UTF-8).
 +
  - Issue #20879: Delay the initialization of encoding and decoding tables for
    base32, ascii85 and base85 codecs in the base64 module, and delay the
    initialization of the unquote_to_bytes() table of the urllib.parse module, to