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-Shared.json

 [
   {
     "cmd": [
       "git",
       "fetch"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "git fetch"
   },
   {
@@ skipping 77 matching lines @@
   },
   {
     "cmd": [
       "make",
       "dm",
       "BUILDTYPE=Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "CHROME_PATH": "/home/chrome-bot/src",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_shared_lib=1 skia_warnings_as_errors=0",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_shared_lib=1 skia_warnings_as_errors=0",
       "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared"
     },
     "name": "build dm"
   },
   {
     "cmd": [
       "make",
       "nanobench",
       "BUILDTYPE=Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "CHROME_PATH": "/home/chrome-bot/src",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_shared_lib=1 skia_warnings_as_errors=0",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_shared_lib=1 skia_warnings_as_errors=0",
       "SKIA_OUT": "[SLAVE_BUILD]/skia/out/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared"
     },
     "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 227 matching lines @@
       "[SLAVE_BUILD]/skia/common/py/utils"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
       "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
     },
     "name": "Upload DM Results"
   }
 ]