Repeats and fixes the changes landed & reverted as CL 1789553003.

pkg/compiler/lib/src/apiimpl.dart

Index: pkg/compiler/lib/src/apiimpl.dart
diff --git a/pkg/compiler/lib/src/apiimpl.dart b/pkg/compiler/lib/src/apiimpl.dart
index 9e28d011ce6587ce43b1a86d9d4431ffd9bb1959..9e04e16a7f08205a6a7f99914e69cb481b8956cc 100644
--- a/pkg/compiler/lib/src/apiimpl.dart
+++ b/pkg/compiler/lib/src/apiimpl.dart
@@ -16,18 +16,17 @@ import 'package:package_config/src/util.dart' show
     checkValidPackageUri;
 
 import '../compiler_new.dart' as api;
-import 'commandline_options.dart';
 import 'common.dart';
 import 'common/tasks.dart' show
     GenericTask;
 import 'compiler.dart';
-import 'diagnostics/diagnostic_listener.dart' show
-    DiagnosticOptions;
 import 'diagnostics/messages.dart' show
     Message;
 import 'elements/elements.dart' as elements;
 import 'environment.dart';
 import 'io/source_file.dart';
+import 'options.dart' show
+    CompilerOptions;
 import 'platform_configuration.dart' as platform_configuration;
 import 'script.dart';
 
@@ -52,7 +51,7 @@ class CompilerImpl extends Compiler {
   Uri get libraryRoot => options.platformConfigUri.resolve(".");
 
   CompilerImpl(this.provider, api.CompilerOutput outputProvider,
-      this.handler, api.CompilerOptions options)
+      this.handler, CompilerOptions options)
       : super(options: options, outputProvider: outputProvider,
           environment: new _Environment(options.environment)) {
     _Environment env = environment;