Fix compile on the Blimp Client Engine Integration bot

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

Index: scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_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_Android_Tester_test_pass.json
index 71be6c867d566d6bcee9375fc08d8cce0beb5e48..d666dd8332ea5a88746da85ca2567d124268e997 100644
--- a/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
+++ b/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_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"
   },
@@ -213,7 +214,7 @@
       "engine",
       "--goma-dir",
       "[CACHE]/cipd/goma",
-      "[SLAVE_BUILD]/src/out-linux/Debug"
+      "[SLAVE_BUILD]/src/out-linux"

[shenghuazhang, 2016/10/14 03:25:32]

Wait... it causes more changes like this. 
Probably it's better to remove api.chromium.set_config('chromium'), rather than
switch place, in case it causes more effects? 
But, not sure any shortage yet if without the chromium.set_config.

[shenghuazhang, 2016/10/14 03:37:10]

Oh not right.. I know what happened here. The missing 'Debug' was caused due to
change of 'linux_build' definition, rather than chromium.set_config...

I.e. though defined BUILD_CONFIG=builder['target'] (which is 'Debug') via
api.chromium_android.configure_from_properties, still needs to define
linux_build as api.path['checkout'].join('out-linux', 'Debug'), rather than
api.path['checkout'].join('out-linux')...?

Sorry for the confusing... I don't know if I have explained this clearly...

     ],
     "cwd": "[SLAVE_BUILD]/src",
     "env": {
@@ -234,7 +235,7 @@
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "--target",
-      "Release",
+      "Debug",
       "--src-dir",
       "[SLAVE_BUILD]/src",
       "--goma-cache-dir",
@@ -254,14 +255,15 @@
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--out-dir",
-      "[SLAVE_BUILD]/src/out-linux/Debug",
+      "[SLAVE_BUILD]/src/out-linux",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--",
       "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": [
@@ -285,7 +287,7 @@
       "client",
       "--goma-dir",
       "[CACHE]/cipd/goma",
-      "[SLAVE_BUILD]/src/out-android/Debug"
+      "[SLAVE_BUILD]/src/out-android"
     ],
     "cwd": "[SLAVE_BUILD]/src",
     "env": {
@@ -306,7 +308,7 @@
       "--ninja-path",
       "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
       "--target",
-      "Release",
+      "Debug",
       "--src-dir",
       "[SLAVE_BUILD]/src",
       "--goma-cache-dir",
@@ -326,7 +328,7 @@
       "--goma-service-account-json-file",
       "/creds/service_accounts/service-account-goma-client.json",
       "--out-dir",
-      "[SLAVE_BUILD]/src/out-android/Debug",
+      "[SLAVE_BUILD]/src/out-android",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--",
@@ -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": [