| Index: infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json | 
| diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json | 
| index f29ee87b9cef427071d33782ab04e0ad904f3ebc..6029de2a3e8554602849542af0b2d232ac9c4c21 100644 | 
| --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json | 
| +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-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", | 
| @@ -67,7 +64,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" | 
| }, | 
| @@ -83,7 +79,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" | 
| @@ -100,7 +95,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" | 
| }, | 
| @@ -136,7 +130,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", | 
| @@ -172,7 +165,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", | 
| @@ -233,7 +225,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" | 
| @@ -255,7 +246,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", | 
| @@ -272,7 +262,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" | 
| @@ -310,7 +299,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", | 
| @@ -358,7 +346,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" | 
| @@ -721,7 +708,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" | 
| }, | 
| @@ -739,7 +725,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" | 
| }, | 
| @@ -755,7 +740,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" | 
| @@ -768,7 +752,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" | 
| @@ -781,7 +764,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" | 
| @@ -795,7 +777,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" | 
| }, | 
| @@ -810,7 +791,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" | 
| }, | 
| @@ -824,7 +804,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" | 
|  |