After applying the fix for issue11824 to tip there ended up being three more
issues:

   1. makeconfig.py should have been updated in d777f854a66e when changing
      imp to _imp.  Without this change a reference to 'PyInit__imp'
      was being generated, but that function does not actually exist.

   2. After fixing (1) I hit an issue where '_frozen_importlib' can
      not be found while bringing up the interpreter.

   3. After fixing (2) I hit the following error when running the
      simple frozen hello app:

         $ ./hello 
         Traceback (most recent call last):
      
         ...

           File "/Users/meadori/Code/src/cpython/Lib/site.py", line 578, in main
             setcopyright()
           File "/Users/meadori/Code/src/cpython/Lib/site.py", line 438, in setcopyright
             here = os.path.dirname(os.__file__)
         AttributeError: 'module' object has no attribute '__file__'

      This happens during 'initsite' and is because of a change made
      to remove the __file__ attribute from frozen modules in 702009f3c0b1.

The attached patch fixes (1) by filtering '_imp' instead of 'imp' in
makeconfig.py, (2) by making sure '_frozen_importlib' is in the frozen
module table created by freeze.py, and (3) by removing the code to delete
__file__ from frozen modules.

I am a little unsure about (3) since I am not sure why the __file__ attribute
is being removed to begin with.  eric.smith?