Update slave scripts to set skia_arch_type but not skia_arch_width

scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json

 [
   {
     "cmd": [
       "git",
       "fetch"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "git fetch"
   },
   {
@@ skipping 59 matching lines @@
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/tools/xsan_build",
       "thread",
       "dm",
       "BUILDTYPE=Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_warnings_as_errors=0",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
       "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN"
     },
     "name": "build dm"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/tools/xsan_build",
       "thread",
       "nanobench",
       "BUILDTYPE=Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_warnings_as_errors=0",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0",
       "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN"
     },
     "name": "build nanobench"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[SLAVE_BUILD]/tmp",
@@ skipping 124 matching lines @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "env": {
       "ASAN_OPTIONS": "symbolize=1 detect_leaks=1",
       "LSAN_OPTIONS": "symbolize=1 print_suppressions=1 suppressions=[SLAVE_BUILD]/skia/tools/lsan.supp",
       "TSAN_OPTIONS": "suppressions=[SLAVE_BUILD]/skia/tools/tsan.supp"
     },
     "name": "dm"
   }
 ]