| Index: infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json | 
| diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json | 
| index 7ed4b3e99e045e040c221c4617b384d5e9a3db2c..f8581fc9cc705f0d4b30a4656b7bdcd0c4c1ac31 100644 | 
| --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json | 
| +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json | 
| @@ -20,7 +20,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm 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": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -51,7 +49,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "get EXTERNAL_STORAGE dir", | 
| @@ -65,7 +62,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "adb root", | 
| @@ -79,7 +75,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm 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": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm 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": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm 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": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -139,7 +131,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "stop shell" | 
| @@ -154,7 +145,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "starting battery stats" | 
| @@ -169,7 +159,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "cat scaling_governor" | 
| @@ -184,7 +173,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm 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": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -237,7 +224,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "read SKP_VERSION", | 
| @@ -273,7 +259,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "read SK_IMAGE_VERSION", | 
| @@ -334,7 +319,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "rmdir skia_dm" | 
| @@ -356,7 +340,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "exists skia_dm", | 
| @@ -373,7 +356,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "mkdir skia_dm" | 
| @@ -411,7 +393,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "get uninteresting hashes", | 
| @@ -459,7 +440,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "push uninteresting_hashes.txt" | 
| @@ -816,7 +796,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -834,7 +813,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -850,7 +828,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "final battery stats" | 
| @@ -863,7 +840,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "reboot" | 
| @@ -876,7 +852,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "wait for reboot" | 
| @@ -890,7 +865,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -905,7 +879,6 @@ | 
| "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk", | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_ANDROID_VERBOSE_SETUP": "1", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| @@ -919,7 +892,6 @@ | 
| "env": { | 
| "BUILDTYPE": "Debug", | 
| "CHROME_HEADLESS": "1", | 
| -      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0", | 
| "SKIA_OUT": "[SLAVE_BUILD]/out" | 
| }, | 
| "name": "kill-server" | 
|  |