Reverts "Try running historically flaky tests first to make flutter build apk health tests time out more often? (#158967)" (#158993)

Reverts: flutter/flutter#158967
Initiated by: matanlurey
Reason for reverting: `--run-skipped` doesn't work in this repository (flutter/flutter#158972).
Original PR Author: matanlurey

Reviewed By: {andrewkolos}

This change reverts the following previous change:
I have no idea if this will work, but `6_6` is currently the suite that seems to have the most problems.

Towards flutter/flutter#158560.

Author: auto-submit[bot]

dev/bots/test.dart

@@ -236,30 +236,15 @@ Future<void> _runIntegrationToolTests() async {
 }
 
 Future<void> _runFlutterBuildApkHealthTests() async {
-  // Try "priming" the test environment by running historically problematic tests first.
-  final List<String> toolIntegrationTests = Directory(path.join(_toolsPath, 'test', 'integration.shard'))
+  final List<String> allTests = Directory(path.join(_toolsPath, 'test', 'flutter_build_apk.shard'))
       .listSync(recursive: true).whereType<File>()
       .map<String>((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath))
       .where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList();
 
   await runDartTest(
     _toolsPath,
     forceSingleCore: true,
-    testPaths: selectIndexOfTotalSubshard<String>(toolIntegrationTests, subshardKey: '6_6'),
-    collectMetrics: true,
-    runSkipped: true,
-  );
-
-  // Then run the health tests after.
-  final List<String> flutterBuildApkTests = Directory(path.join(_toolsPath, 'test', 'flutter_build_apk.shard'))
-      .listSync(recursive: true).whereType<File>()
-      .map<String>((FileSystemEntity entry) => path.relative(entry.path, from: _toolsPath))
-      .where((String testPath) => path.basename(testPath).endsWith('_test.dart')).toList();
-
-  await runDartTest(
-    _toolsPath,
-    forceSingleCore: true,
-    testPaths: selectIndexOfTotalSubshard<String>(flutterBuildApkTests),
+    testPaths: selectIndexOfTotalSubshard<String>(allTests),
     collectMetrics: true,
   );
 }

dev/bots/utils.dart

@@ -342,7 +342,6 @@ Future<void> runDartTest(String workingDirectory, {
   bool ensurePrecompiledTool = true,
   bool shuffleTests = true,
   bool collectMetrics = false,
-  bool runSkipped = false,
 }) async {
   int? cpus;
   final String? cpuVariable = Platform.environment['CPU']; // CPU is set in cirrus.yml
@@ -380,8 +379,6 @@ Future<void> runDartTest(String workingDirectory, {
       '--coverage=$coverage',
     if (perTestTimeout != null)
       '--timeout=${perTestTimeout.inMilliseconds}ms',
-    if (runSkipped)
-      '--run-skipped',
     if (testPaths != null)
       for (final String testPath in testPaths)
         testPath,