Reland "Remove --shard-timeout from webrtc recipes now that they are in wrapper scripts"

scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__failing_test.json

Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__failing_test.json
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__failing_test.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__failing_test.json
index f347487810173ca78b4892d747615b53ef634128..94b0968d0cd1336906330a8c799d3ef044804328 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__failing_test.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5__failing_test.json
@@ -341,9 +341,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_audio_decoder_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -358,9 +356,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_common_audio_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -375,9 +371,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_common_video_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -392,9 +386,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_modules_tests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -409,9 +401,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_modules_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -426,9 +416,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_peerconnection_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -443,9 +431,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_system_wrappers_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -460,9 +446,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_test_support_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -477,9 +461,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_tools_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -498,9 +480,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_video_engine_tests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -515,9 +495,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_voice_engine_unittests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -532,9 +510,7 @@
       "[SLAVE_BUILD]/src/out/Release/bin/run_webrtc_nonparallel_tests",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--verbose",
-      "-t",
-      "900"
+      "--verbose"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -570,18 +546,9 @@
       "--build-number=1337",
       "--run-python-script",
       "--revision=170242",
-      "[SLAVE_BUILD]/src/webrtc/build/android/test_runner.py",
-      "gtest",
-      "-s",
-      "webrtc_perf_tests",
-      "--verbose",
-      "--release",
-      "-t",
-      "2700"
+      "[SLAVE_BUILD]/src/out/Release/bin/run_webrtc_perf_tests",
+      "--verbose"
     ],
-    "env": {
-      "CHROMIUM_OUT_DIR": "[SLAVE_BUILD]/src/out/Release"
-    },
     "name": "webrtc_perf_tests"
   },
   {