Skia recipes: Move Android and ChromeOS config info in from slaves.cfg

scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot.json

 [
   {
     "cmd": [
       "git.bat",
       "fetch"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "name": "git fetch"
   },
   {
@@ skipping 105 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1], 'w') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@  f.write(os.path.join(os.path.expanduser('~'), 'src'))@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "make.py",
       "nanobench",
-      "BUILDTYPE=Release"
+      "BUILDTYPE=Release_x64"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "env": {
       "CHROME_PATH": "/home/chrome-bot/src",
-      "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_arch_width=32 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
+      "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_arch_width=64 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
     },
     "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",
       "511"
@@ skipping 33 matching lines @@
       "/path/to/tmp/"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "Get downloaded SKP_VERSION"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data"
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "rmtree data",
     "~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@@@",
       "@@@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",
       "\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]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data",
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data",
       "511"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "makedirs data",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
       "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
       "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]\\skia\\tools/nanobench_flags.py",
       "/path/to/tmp/json",
-      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot"
+      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "name": "exec nanobench_flags.py",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@[@@@",
       "@@@STEP_LOG_LINE@json.output@  \"--dummy-flags\"@@@",
       "@@@STEP_LOG_LINE@json.output@]@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "[DEPOT_TOOLS]\\git.bat",
       "show",
       "HEAD",
       "--format=%at",
       "-s"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "name": "git show",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]\\skia\\out\\Release\\nanobench",
+      "[SLAVE_BUILD]\\skia\\out\\Release_x64\\nanobench",
       "--undefok",
       "-i",
       "[SLAVE_BUILD]\\skia\\resources",
       "--skps",
       "[SLAVE_BUILD]\\playback\\skps",
       "--nocpu",
       "--dummy-flags",
       "--outResultsFile",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data\\nanobench_164710_1408633190.json",
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data\\nanobench_164710_1408633190.json",
       "--properties",
       "gitHash",
       "164710",
       "build_number",
       "5",
       "--key",
       "arch",
-      "x86",
+      "x86_64",
       "compiler",
       "MSVC",
       "cpu_or_gpu",
       "GPU",
       "cpu_or_gpu_value",
       "HD2000",
       "model",
       "ShuttleA",
       "os",
       "Win7"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "nanobench"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[skia]\\resources\\upload_bench_results.py",
-      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot",
+      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot",
       "5",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data",
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data",
       "164710",
       "[DEPOT_TOOLS]\\third_party\\gsutil\\gsutil",
       "500"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "name": "Upload Nanobench Results"
   }
 ]