Clean up imports in analysis_server and analyzer_cli (and one missed in analyzer)

pkg/analysis_server/lib/src/services/dependencies/library_dependencies.dart

Index: pkg/analysis_server/lib/src/services/dependencies/library_dependencies.dart
diff --git a/pkg/analysis_server/lib/src/services/dependencies/library_dependencies.dart b/pkg/analysis_server/lib/src/services/dependencies/library_dependencies.dart
index e55993d58b84cf3a9fd7e45cb21b63310e8dc7ed..0c309186979d05eadb0f18cc8f3fbc36b4676b8e 100644
--- a/pkg/analysis_server/lib/src/services/dependencies/library_dependencies.dart
+++ b/pkg/analysis_server/lib/src/services/dependencies/library_dependencies.dart
@@ -4,8 +4,8 @@
 
 library services.dependencies.library;
 
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
@@ -42,13 +42,6 @@ class LibraryDependencyCollector {
     return _dependencies;
   }
 
-  Map<AnalysisContext, Folder> _reverse(Map<Folder, AnalysisContext> map) {
-    Map<AnalysisContext, Folder> reverseMap =
-        new Map<AnalysisContext, Folder>();
-    map.forEach((Folder f, AnalysisContext c) => reverseMap[c] = f);
-    return reverseMap;
-  }
-
   void _addDependencies(LibraryElement libraryElement) {
     if (libraryElement == null) {
       return;
@@ -66,4 +59,11 @@ class LibraryDependencyCollector {
           (ExportElement export) => _addDependencies(export.exportedLibrary));
     }
   }
+
+  Map<AnalysisContext, Folder> _reverse(Map<Folder, AnalysisContext> map) {
+    Map<AnalysisContext, Folder> reverseMap =
+        new Map<AnalysisContext, Folder>();
+    map.forEach((Folder f, AnalysisContext c) => reverseMap[c] = f);
+    return reverseMap;
+  }
 }