Remove default AppContext and cleanup globals (#6999)

diff --git a/packages/flutter_tools/lib/src/commands/config.dart b/packages/flutter_tools/lib/src/commands/config.dart
index af16a39..cc1340d 100644
--- a/packages/flutter_tools/lib/src/commands/config.dart
+++ b/packages/flutter_tools/lib/src/commands/config.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import '../globals.dart';
+import '../usage.dart';
 import '../runner/flutter_command.dart';
 
 class ConfigCommand extends FlutterCommand {

diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart
index 7676e8c..3d21f16 100644
--- a/packages/flutter_tools/lib/src/commands/create.dart
+++ b/packages/flutter_tools/lib/src/commands/create.dart

@@ -12,6 +12,7 @@
 import '../base/utils.dart';
 import '../cache.dart';
 import '../dart/pub.dart';
+import '../doctor.dart';
 import '../globals.dart';
 import '../runner/flutter_command.dart';
 import '../template.dart';

diff --git a/packages/flutter_tools/lib/src/commands/devices.dart b/packages/flutter_tools/lib/src/commands/devices.dart
index 687a3ac..4547ade 100644
--- a/packages/flutter_tools/lib/src/commands/devices.dart
+++ b/packages/flutter_tools/lib/src/commands/devices.dart

@@ -7,6 +7,7 @@
 import '../base/common.dart';
 import '../base/utils.dart';
 import '../device.dart';
+import '../doctor.dart';
 import '../globals.dart';
 import '../runner/flutter_command.dart';
 

diff --git a/packages/flutter_tools/lib/src/commands/doctor.dart b/packages/flutter_tools/lib/src/commands/doctor.dart
index f1a6a17..df4da8c 100644
--- a/packages/flutter_tools/lib/src/commands/doctor.dart
+++ b/packages/flutter_tools/lib/src/commands/doctor.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import '../globals.dart';
+import '../doctor.dart';
 import '../runner/flutter_command.dart';
 
 class DoctorCommand extends FlutterCommand {

diff --git a/packages/flutter_tools/lib/src/commands/setup.dart b/packages/flutter_tools/lib/src/commands/setup.dart
index 4f3b0cf..afc2326 100644
--- a/packages/flutter_tools/lib/src/commands/setup.dart
+++ b/packages/flutter_tools/lib/src/commands/setup.dart

@@ -7,6 +7,7 @@
 import '../base/common.dart';
 import '../base/os.dart';
 import '../base/process.dart';
+import '../doctor.dart';
 import '../globals.dart';
 import '../runner/flutter_command.dart';
 

diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart
index 2e5c8d0..21295fd 100644
--- a/packages/flutter_tools/lib/src/commands/upgrade.dart
+++ b/packages/flutter_tools/lib/src/commands/upgrade.dart

@@ -7,9 +7,10 @@
 import '../base/common.dart';
 import '../base/os.dart';
 import '../base/process.dart';
+import '../cache.dart';
 import '../dart/pub.dart';
 import '../dart/summary.dart';
-import '../cache.dart';
+import '../doctor.dart';
 import '../globals.dart';
 import '../runner/flutter_command.dart';
 import '../version.dart';