Revert "Revert "Allow patch files to add top-level declarations to the patched library.""

lib/compiler/implementation/scanner/scanner_task.dart

Index: lib/compiler/implementation/scanner/scanner_task.dart
diff --git a/lib/compiler/implementation/scanner/scanner_task.dart b/lib/compiler/implementation/scanner/scanner_task.dart
index a1ed5fb6ba1faf9dd96d814c8bd959a64ad8bda7..fb2e1fdc405e1b2940d3de557fdd9d3c46b86d6a 100644
--- a/lib/compiler/implementation/scanner/scanner_task.dart
+++ b/lib/compiler/implementation/scanner/scanner_task.dart
@@ -130,7 +130,7 @@ class ScannerTask extends CompilerTask {
   }
 
   void importLibrary(LibraryElement library, LibraryElement imported,
-                     ScriptTag tag, [CompilationUnitElement patch]) {
+                     ScriptTag tag, [CompilationUnitElement override]) {
     if (!imported.hasLibraryName()) {
       compiler.withCurrentElement(library, () {
         compiler.reportError(tag === null ? null : tag.argument,
@@ -142,7 +142,11 @@ class ScannerTask extends CompilerTask {
           new SourceString(tag.prefix.dartString.slowToString());
       Element e = library.find(prefix);
       if (e === null) {
-        e = new PrefixElement(prefix, library, tag.getBeginToken(), patch);
+        Element enclosing = library;
+        if (override !== null) {
+          enclosing = new CompilationUnitOverrideElement(override, library);
+        }
+        e = new PrefixElement(prefix, enclosing, tag.getBeginToken());
         library.define(e, compiler);
       }
       if (e.kind !== ElementKind.PREFIX) {