Refactoring analyzer_cli for code hygiene.

pkg/analyzer_cli/test/package_prefix_test.dart

 import 'dart:async';
 import 'dart:io' show exitCode;
 
-import 'package:analyzer_cli/src/driver.dart' show Driver, outSink, errorSink;
-import 'package:analyzer_cli/src/options.dart' show ExitHandler, exitHandler;
+import 'package:analyzer_cli/src/analyzer_driver.dart'
+    show Driver, outSink, errorSink;
+import 'package:analyzer_cli/src/analyzer_options.dart'
+    show ExitHandler, exitHandler;
 import 'package:path/path.dart';
 import 'package:test/test.dart';
 
 import 'utils.dart' show testDirectory;
 
 main() {
   group('--x-package-warnings-prefix', () {
     _Runner runner;
 
     setUp(() {
@@ skipping 51 matching lines @@
     }
   }
 
   void tearDown() {
     outSink = _savedOutSink;
     errorSink = _savedErrorSink;
     exitCode = _savedExitCode;
     exitHandler = _savedExitHandler;
   }
 }