WebRTC: Add Android more configs bots.

scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Android32__more_configs_.json

Index: scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Android32__more_configs_.json
diff --git a/scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json b/scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Android32__more_configs_.json
similarity index 88%
copy from scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json
copy to scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Android32__more_configs_.json
index 00459b2de695ccf02d41a3d63f4a86cb8ecab0e5..ba2df585a7e1ff2ae0799b4541b7012580e75491 100644
--- a/scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Linux__more_configs_.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/full_client_webrtc_Android32__more_configs_.json
@@ -5,7 +5,7 @@
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]\ntarget_os = ['android']",
       "--patch_root",
       "src",
       "--revision_mapping_file",
@@ -117,8 +117,9 @@
     "cwd": "[SLAVE_BUILD]/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "component=shared_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"
   },
@@ -130,7 +131,7 @@
       "--root=[SLAVE_BUILD]/src",
       "gen",
       "//out/Debug",
-      "--args=is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+      "--args=is_debug=true target_os=\"android\" target_cpu=\"arm\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
     ],
     "cwd": "[SLAVE_BUILD]/src",
     "name": "gn",
@@ -157,13 +158,13 @@
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
-      "Linux (more configs)",
+      "Android32 (more configs)",
       "--buildbot-mastername",
       "client.webrtc",
       "--buildbot-slavename",
       "TestSlavename",
       "--goma-deps-cache-file",
-      "Linux__more_configs_.gomadeps",
+      "Android32__more_configs_.gomadeps",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
@@ -175,7 +176,8 @@
       "--"
     ],
     "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": [
@@ -191,7 +193,7 @@
       "--root=[SLAVE_BUILD]/src",
       "gen",
       "//out/Debug",
-      "--args=rtc_enable_intelligibility_enhancer=true is_debug=true target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+      "--args=rtc_enable_intelligibility_enhancer=true is_debug=true target_os=\"android\" target_cpu=\"arm\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
     ],
     "cwd": "[SLAVE_BUILD]/src",
     "name": "gn (2)",
@@ -218,13 +220,13 @@
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
-      "Linux (more configs)",
+      "Android32 (more configs)",
       "--buildbot-mastername",
       "client.webrtc",
       "--buildbot-slavename",
       "TestSlavename",
       "--goma-deps-cache-file",
-      "Linux__more_configs_.gomadeps",
+      "Android32__more_configs_.gomadeps",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
@@ -236,7 +238,8 @@
       "--"
     ],
     "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": [