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

pkg/analysis_server/test/services/refactoring/abstract_rename.dart

Index: pkg/analysis_server/test/services/refactoring/abstract_rename.dart
diff --git a/pkg/analysis_server/test/services/refactoring/abstract_rename.dart b/pkg/analysis_server/test/services/refactoring/abstract_rename.dart
index 0dd3c77b088ce3cada68686ab036ef05d936df95..f7b036f3fd818ab1a1dfc5721f07e8f027cfcf81 100644
--- a/pkg/analysis_server/test/services/refactoring/abstract_rename.dart
+++ b/pkg/analysis_server/test/services/refactoring/abstract_rename.dart
@@ -7,8 +7,8 @@ library test.services.refactoring.rename;
 import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
 import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/ast.dart';
-import 'package:analyzer/src/generated/element.dart';
 import 'package:unittest/unittest.dart';
 
 import 'abstract_refactoring.dart';