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

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

Index: pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
index 0e395fad544c849c022929eb8eaf12feb8b6e323..b77ff97d96094520c5d27251430b4b7a9c7205ea 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
@@ -7,11 +7,13 @@ library services.completion.dart.suggestion.builder;
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/protocol_server.dart'
     hide Element, ElementKind;
-import 'package:analyzer/src/generated/element.dart';
+import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:path/path.dart' as path;
-import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 
 const String DYNAMIC = 'dynamic';
 
@@ -107,14 +109,14 @@ abstract class ElementSuggestionBuilder {
   final List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
 
   /**
-   * Return the kind of suggestions that should be built.
+   * Return the library in which the completion is requested.
    */
-  CompletionSuggestionKind get kind;
+  LibraryElement get containingLibrary;
 
   /**
-   * Return the library in which the completion is requested.
+   * Return the kind of suggestions that should be built.
    */
-  LibraryElement get containingLibrary;
+  CompletionSuggestionKind get kind;
 
   /**
    * Add a suggestion based upon the given element.