| Index: infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json | 
| diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json | 
| index ebcafc34eb4a9fb561ead7ce0416e04bf63ec77d..9d1e16ca839c193ea8f0b65ff4765be647e5185c 100644 | 
| --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json | 
| +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json | 
| @@ -20,7 +20,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -35,7 +34,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -51,7 +49,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "get EXTERNAL_STORAGE dir", | 
| @@ -65,7 +62,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "adb root", | 
| @@ -79,7 +75,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "wait" | 
| @@ -93,7 +88,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -108,7 +102,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -124,7 +117,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -139,7 +131,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "stop shell" | 
| @@ -154,7 +145,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "starting battery stats" | 
| @@ -169,7 +159,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "cat scaling_governor" | 
| @@ -184,7 +173,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "cat cpu_freq" | 
| @@ -201,7 +189,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -237,7 +224,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "read SKP_VERSION", | 
| @@ -273,7 +259,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "read SK_IMAGE_VERSION", | 
| @@ -290,7 +275,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "rmdir skia_perf" | 
| @@ -312,7 +296,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "exists skia_perf", | 
| @@ -329,7 +312,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "mkdir skia_perf" | 
| @@ -422,7 +404,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -462,7 +443,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -478,7 +458,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "final battery stats" | 
| @@ -491,7 +470,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "reboot" | 
| @@ -504,7 +482,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "wait for reboot" | 
| @@ -518,7 +495,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -533,7 +509,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -547,7 +522,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Release", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_dump_stats=1 skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "kill-server" | 
|  |