Clean up steps in Chromedriver recipe.

scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__basic.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.fyi",
       "--builder",
       "Android ChromeDriver Tests (dbg)",
@@ skipping 475 matching lines @@
     ],
     "name": "Download Prebuilts.move prebuilt",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
+      "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/prebuilt_tmp_1"
     ],
-    "name": "Download Prebuilts.rmtree remove temp dir",
+    "name": "Download Prebuilts.rmtree [TMP_BASE]/prebuilt_tmp_1",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "python_tests chrome_beta"
+  },
+  {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_2/server_log",
+      "[TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
       "chrome_beta"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chrome_beta)"
+    "name": "python_tests chrome_beta.Run test python_tests chrome_beta",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_2/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571",
+      "gs://chromedriver-data/server_logs/python_tests_chrome_beta_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_2/server_log",
+    "name": "python_tests chrome_beta.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_2/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_2/python_tests_chrome_beta_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_beta_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_2"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_2"
+    "name": "python_tests chrome_beta.rmtree [TMP_BASE]/server_log_tmp_2",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "java_tests chrome_beta"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_3/server_log",
+      "[TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571",
       "--verbose",
       "--android-package",
       "chrome_beta"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chrome_beta)"
+    "name": "java_tests chrome_beta.Run test java_tests chrome_beta",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_3/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571",
+      "gs://chromedriver-data/server_logs/java_tests_chrome_beta_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_3/server_log",
+    "name": "java_tests chrome_beta.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_3/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_3/java_tests_chrome_beta_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chrome_beta_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_3"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_3"
+    "name": "java_tests chrome_beta.rmtree [TMP_BASE]/server_log_tmp_3",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "python_tests chrome_stable"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_4/server_log",
+      "[TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
       "chrome_stable"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chrome_stable)"
+    "name": "python_tests chrome_stable.Run test python_tests chrome_stable",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_4/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
+      "gs://chromedriver-data/server_logs/python_tests_chrome_stable_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_4/server_log",
+    "name": "python_tests chrome_stable.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_4/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_4/python_tests_chrome_stable_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chrome_stable_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_4"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_4"
+    "name": "python_tests chrome_stable.rmtree [TMP_BASE]/server_log_tmp_4",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "java_tests chrome_stable"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_5/server_log",
+      "[TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571",
       "--verbose",
       "--android-package",
       "chrome_stable"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chrome_stable)"
+    "name": "java_tests chrome_stable.Run test java_tests chrome_stable",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_5/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571",
+      "gs://chromedriver-data/server_logs/java_tests_chrome_stable_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_5/server_log",
+    "name": "java_tests chrome_stable.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_5/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_5/java_tests_chrome_stable_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chrome_stable_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_5"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_5"
+    "name": "java_tests chrome_stable.rmtree [TMP_BASE]/server_log_tmp_5",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "python_tests chromedriver_webview_shell"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_6/server_log",
+      "[TMP_BASE]/server_log_tmp_6/python_tests_chromedriver_webview_shell_571",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
       "chromedriver_webview_shell"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chromedriver_webview_shell)"
+    "name": "python_tests chromedriver_webview_shell.Run test python_tests chromedriver_webview_shell",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_6/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_6/python_tests_chromedriver_webview_shell_571",
+      "gs://chromedriver-data/server_logs/python_tests_chromedriver_webview_shell_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_6/server_log",
+    "name": "python_tests chromedriver_webview_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_6/python_tests_chromedriver_webview_shell_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_6/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_6/python_tests_chromedriver_webview_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chromedriver_webview_shell_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_6"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_6"
+    "name": "python_tests chromedriver_webview_shell.rmtree [TMP_BASE]/server_log_tmp_6",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "java_tests chromedriver_webview_shell"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_7/server_log",
+      "[TMP_BASE]/server_log_tmp_7/java_tests_chromedriver_webview_shell_571",
       "--verbose",
       "--android-package",
       "chromedriver_webview_shell"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chromedriver_webview_shell)"
+    "name": "java_tests chromedriver_webview_shell.Run test java_tests chromedriver_webview_shell",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_7/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_7/java_tests_chromedriver_webview_shell_571",
+      "gs://chromedriver-data/server_logs/java_tests_chromedriver_webview_shell_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/server_log",
+    "name": "java_tests chromedriver_webview_shell.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/java_tests_chromedriver_webview_shell_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/java_tests_chromedriver_webview_shell_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chromedriver_webview_shell_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_7"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_7"
+    "name": "java_tests chromedriver_webview_shell.rmtree [TMP_BASE]/server_log_tmp_7",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "python_tests chromium"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_8/server_log",
+      "[TMP_BASE]/server_log_tmp_8/python_tests_chromium_571",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
       "chromium"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chromium)"
+    "name": "python_tests chromium.Run test python_tests chromium",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_8/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_8/python_tests_chromium_571",
+      "gs://chromedriver-data/server_logs/python_tests_chromium_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_8/server_log",
+    "name": "python_tests chromium.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_8/python_tests_chromium_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_8/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_8/python_tests_chromium_571@https://storage.cloud.google.com/chromedriver-data/server_logs/python_tests_chromium_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_8"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_8"
+    "name": "python_tests chromium.rmtree [TMP_BASE]/server_log_tmp_8",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "java_tests chromium"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
-      "[TMP_BASE]/server_log_tmp_9/server_log",
+      "[TMP_BASE]/server_log_tmp_9/java_tests_chromium_571",
       "--verbose",
       "--android-package",
       "chromium"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chromium)"
+    "name": "java_tests chromium.Run test java_tests chromium",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
-      "[TMP_BASE]/server_log_tmp_9/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
+      "[TMP_BASE]/server_log_tmp_9/java_tests_chromium_571",
+      "gs://chromedriver-data/server_logs/java_tests_chromium_571"
     ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_9/server_log",
+    "name": "java_tests chromium.gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_9/java_tests_chromium_571",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_9/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_9/java_tests_chromium_571@https://storage.cloud.google.com/chromedriver-data/server_logs/java_tests_chromium_571@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_9"
     ],
-    "name": "rmtree [TMP_BASE]/server_log_tmp_9"
+    "name": "java_tests chromium.rmtree [TMP_BASE]/server_log_tmp_9",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [],
     "name": "Download Test Results Log"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
@@ skipping 19 matching lines @@
     ],
     "name": "Download Test Results Log.read results log file",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
+      "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/results_log_tmp_10"
     ],
-    "name": "Download Test Results Log.rmtree remove temp dir",
+    "name": "Download Test Results Log.rmtree [TMP_BASE]/results_log_tmp_10",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [],
     "name": "Upload Test Results Log"
   },
   {
     "cmd": [
       "python",
       "-u",
@@ skipping 21 matching lines @@
     "name": "Upload Test Results Log.gsutil upload results log android_log.json",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LINK@results log@https://storage.cloud.google.com/chromedriver-data/android_log.json@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
+      "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/results_log_tmp_11"
     ],
-    "name": "Upload Test Results Log.rmtree remove temp dir",
+    "name": "Upload Test Results Log.rmtree [TMP_BASE]/results_log_tmp_11",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  chromium_utils.RemoveDirectory(sys.argv[1])@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
+      "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "stop",
       "--pid-file-path",
@@ skipping 90 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]