Revert of Make the static clang/win ToT bots do official builds.

scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTWin64.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]\\scripts\\slave\\kill_processes.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "taskkill"
   },
@@ skipping 75 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "[DEPOT_TOOLS]\\gclient.py",
       "runhooks"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
-      "GYP_DEFINES": "branding=Chrome buildtype=Official clang=1 component=static_library fastbuild=1 target_arch=x64 test_isolation_mode=prepare",
+      "GYP_DEFINES": "clang=1 component=static_library fastbuild=1 target_arch=x64 test_isolation_mode=prepare",
       "LLVM_FORCE_HEAD_REVISION": "YES"
     },
     "name": "gclient runhooks"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.fyi.json",
@@ skipping 90 matching lines @@
       "-u",
       "[BUILD]\\scripts\\slave\\compile.py",
       "--target",
       "Release_x64",
       "--src-dir",
       "[SLAVE_BUILD]\\src",
       "--build-tool",
       "ninja",
       "--compiler",
       "clang",
-      "--mode",
-      "official",
-      "--clobber",
       "--"
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "LLVM_FORCE_HEAD_REVISION": "YES"
     },
     "name": "compile"
   },
   {
     "cmd": [
@@ skipping 45 matching lines @@
       "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
       "--factory-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"ClangToTWin64\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--build-properties",
       "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"ClangToTWin64\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "package build"
   }
 ]