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

pkg/analysis_server/test/services/completion/completion_test_util.dart

Index: pkg/analysis_server/test/services/completion/completion_test_util.dart
diff --git a/pkg/analysis_server/test/services/completion/completion_test_util.dart b/pkg/analysis_server/test/services/completion/completion_test_util.dart
index 3fd76871df1d537f048a1bbf65b5f5692082c846..1ffec9fac7c29938e039078ae7796433d6ccac04 100644
--- a/pkg/analysis_server/test/services/completion/completion_test_util.dart
+++ b/pkg/analysis_server/test/services/completion/completion_test_util.dart
@@ -19,8 +19,8 @@ import 'package:analysis_server/src/services/completion/imported_reference_contr
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
 import 'package:analysis_server/src/services/search/search_engine_internal.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/ast.dart';
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
@@ -3307,6 +3307,14 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
     });
   }
 
+  test_localVariableDeclarationName() {
+    addTestSource('main() {String m^}');
+    return computeFull((bool result) {
+      assertNotSuggested('main');
+      assertNotSuggested('min');
+    });
+  }
+
   test_MapLiteralEntry() {
     // MapLiteralEntry  MapLiteral  VariableDeclaration
     addSource(
@@ -4174,14 +4182,6 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
     });
   }
 
-  test_localVariableDeclarationName() {
-    addTestSource('main() {String m^}');
-    return computeFull((bool result) {
-      assertNotSuggested('main');
-      assertNotSuggested('min');
-    });
-  }
-
   test_PrefixedIdentifier_trailingStmt_param2() {
     // SimpleIdentifier  PrefixedIdentifier  ExpressionStatement
     addTestSource('f(String g) {g.^ int y = 0;}');