Move importlib's built-in importer to use rpartition for __package__.
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 99fb236..bc50036 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -115,7 +115,9 @@
         """Load a built-in module."""
         if fullname not in sys.builtin_module_names:
             raise ImportError("{0} is not a built-in module".format(fullname))
-        return imp.init_builtin(fullname)
+        module = imp.init_builtin(fullname)
+        module.__package__ = ''
+        return module
 
 
 class FrozenImporter:
diff --git a/Lib/importlib/test/builtin/test_loader.py b/Lib/importlib/test/builtin/test_loader.py
index 940529e..1171960 100644
--- a/Lib/importlib/test/builtin/test_loader.py
+++ b/Lib/importlib/test/builtin/test_loader.py
@@ -15,7 +15,7 @@
     assert 'errno' in sys.builtin_module_names
     name = 'errno'
 
-    verification = {'__name__': 'errno', '__package__': None}
+    verification = {'__name__': 'errno', '__package__': ''}
 
     def verify(self, module):
         """Verify that the module matches against what it should have."""