WebRTC: Add Android more configs bots.

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

Index: scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_android_more_configs.json
diff --git a/scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_linux_more_configs.json b/scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_android_more_configs.json
similarity index 88%
copy from scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_linux_more_configs.json
copy to scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_android_more_configs.json
index cea178554f31939741bfbd405825757ad4be2f1e..57fc8e3216315d35b5d8541f7a74d86f17823926 100644
--- a/scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_linux_more_configs.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/full_tryserver_webrtc_android_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",
@@ -123,8 +123,9 @@
     "cwd": "[SLAVE_BUILD]/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 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 dcheck_always_on=1 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"
   },
@@ -136,7 +137,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",
@@ -163,13 +164,13 @@
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
-      "linux_more_configs",
+      "android_more_configs",
       "--buildbot-mastername",
       "tryserver.webrtc",
       "--buildbot-slavename",
       "TestSlavename",
       "--goma-deps-cache-file",
-      "linux_more_configs.gomadeps",
+      "android_more_configs.gomadeps",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
@@ -183,7 +184,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": [
@@ -199,7 +201,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)",
@@ -226,13 +228,13 @@
       "--goma-cache-dir",
       "[GOMA_CACHE]",
       "--buildbot-buildername",
-      "linux_more_configs",
+      "android_more_configs",
       "--buildbot-mastername",
       "tryserver.webrtc",
       "--buildbot-slavename",
       "TestSlavename",
       "--goma-deps-cache-file",
-      "linux_more_configs.gomadeps",
+      "android_more_configs.gomadeps",
       "--compiler",
       "goma",
       "--goma-jsonstatus",
@@ -246,7 +248,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": [