Move scanner out of generated and clean up imports

pkg/analyzer/lib/src/task/incremental_element_builder.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.task.incremental_element_builder;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/visitor.dart';
+import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/builder.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/generated/resolver.dart';
-import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * The change of a single [CompilationUnitElement].
  */
 class CompilationUnitElementDelta {
   /**
    * One or more directives were added/removed.
    */
   bool hasDirectiveChange = false;
@@ skipping 335 matching lines @@
     }
     int oldOffset = element.nameOffset;
     int newOffset = map[oldOffset];
     assert(newOffset != null);
     (element as ElementImpl).nameOffset = newOffset;
     if (element is! LibraryElement) {
       super.visitElement(element);
     }
   }
 }