Give autogen bots on chromium.fyi and client.nacl.sdk a separate clobber step

scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json

Index: scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
diff --git a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
index e322bc5cd8aa7fb28428150e5275ebf41ed73aa3..faa58d5ca9f44e84e3a9f681f82d38c961d48855 100644
--- a/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
+++ b/scripts/slave/recipes/client.nacl.sdk.recipe_autogen.expected/windows_sdk_multirel.json
@@ -92,6 +92,25 @@
     "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",
+      "[SLAVE_BUILD]/chrome-official/out/Release"
+    ],
+    "name": "rmtree clobber",
+    "~followup_annotations": [
+      "@@@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@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "[BUILD]/scripts/slave/runhooks_wrapper.py"
     ],
     "env": {
@@ -118,14 +137,10 @@
       "python",
       "-u",
       "[BUILD]/scripts/slave/compile.py",
-      "--solution",
-      "all.sln",
-      "--project",
-      "chromium_builder_tests",
       "--target",
       "Release",
-      "--clobber",
-      "--compiler=goma"
+      "--compiler=goma",
+      "chromium_builder_tests"
     ],
     "name": "compile"
   },