Fix compile on the Blimp Client Engine Integration bot

scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json

Index: scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
diff --git a/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json b/scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
similarity index 95%
rename from scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
rename to scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
index 71be6c867d566d6bcee9375fc08d8cce0beb5e48..df3288984737fffc3ea1712e2694a4663d3622bf 100644
--- a/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
+++ b/scripts/slave/recipes/blimp/integration.expected/Blimp_Client_Engine_Integration_test_pass.json
@@ -192,8 +192,9 @@
     "cwd": "[SLAVE_BUILD]/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
-      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+      "GYP_CROSSCOMPILE": "1",
+      "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },
@@ -234,7 +235,7 @@
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "--target",
-      "Release",
+      "Debug",
       "--src-dir",
       "[SLAVE_BUILD]/src",
       "--goma-cache-dir",
@@ -261,7 +262,8 @@
       "blimp"
     ],
     "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "compile",
     "~followup_annotations": [
@@ -306,7 +308,7 @@
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "--target",
-      "Release",
+      "Debug",
       "--src-dir",
       "[SLAVE_BUILD]/src",
       "--goma-cache-dir",
@@ -334,7 +336,8 @@
       "chrome_public_apk"
     ],
     "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "compile (2)",
     "~followup_annotations": [