WebRTC: Make WebRTC's Test more similar to Chromium's GTestTest

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

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[BUILDER_CACHE]/android_dbg",
       "511"
     ],
     "name": "makedirs checkout path",
@@ skipping 209 matching lines @@
       "gen",
       "-m",
       "tryserver.webrtc",
       "-b",
       "android_dbg",
       "--config-file",
       "[BUILDER_CACHE]/android_dbg/src/webrtc/build/mb_config.pyl",
       "--goma-dir",
       "[CACHE]/cipd/goma",
       "--swarming-targets-file",
-      "AppRTCMobileTest\nandroid_junit_tests\naudio_decoder_unittests\ncommon_audio_unittests\ncommon_video_unittests\nlibjingle_peerconnection_android_unittest\nmodules_tests\nmodules_unittests\npeerconnection_unittests\nrtc_stats_unittests\nrtc_unittests\nsystem_wrappers_unittests\ntest_support_unittests\ntools_unittests\nvideo_engine_tests\nvoice_engine_unittests\nwebrtc_nonparallel_tests\n",
+      "AppRTCMobileTest\naudio_decoder_unittests\ncommon_audio_unittests\ncommon_video_unittests\nlibjingle_peerconnection_android_unittest\nmodules_tests\nmodules_unittests\npeerconnection_unittests\nrtc_stats_unittests\nrtc_unittests\nsystem_wrappers_unittests\ntest_support_unittests\ntools_unittests\nvideo_engine_tests\nvoice_engine_unittests\nwebrtc_nonparallel_tests\n",
       "--gyp-script=[BUILDER_CACHE]/android_dbg/src/webrtc/build/gyp_webrtc.py",
       "//out/Debug"
     ],
     "cwd": "[BUILDER_CACHE]/android_dbg/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
     },
     "name": "generate_build_files",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@AppRTCMobileTest@@@",
-      "@@@STEP_LOG_LINE@swarming-targets-file.txt@android_junit_tests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@audio_decoder_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@common_audio_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@common_video_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@libjingle_peerconnection_android_unittest@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@modules_tests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@modules_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@peerconnection_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@rtc_stats_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@rtc_unittests@@@",
       "@@@STEP_LOG_LINE@swarming-targets-file.txt@system_wrappers_unittests@@@",
@@ skipping 69 matching lines @@
       "python",
       "-u",
       "RECIPE_MODULE[build::isolate]/resources/isolate.py",
       "[BUILDER_CACHE]/android_dbg/src/tools/swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/AppRTCMobileTest.isolated.gen.json",
-      "[BUILDER_CACHE]/android_dbg/src/out/Debug/android_junit_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/audio_decoder_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/common_audio_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/common_video_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/libjingle_peerconnection_android_unittest.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/modules_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/modules_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/peerconnection_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/rtc_stats_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/rtc_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/system_wrappers_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/test_support_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/tools_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/video_engine_tests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/voice_engine_unittests.isolated.gen.json",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/webrtc_nonparallel_tests.isolated.gen.json"
     ],
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"android_junit_tests\": \"[dummy hash for android_junit_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"libjingle_peerconnection_android_unittest\": \"[dummy hash for libjingle_peerconnection_android_unittest]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"modules_tests\": \"[dummy hash for modules_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"modules_unittests\": \"[dummy hash for modules_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"rtc_stats_unittests\": \"[dummy hash for rtc_stats_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tools_unittests\": \"[dummy hash for tools_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"webrtc_nonparallel_tests\": \"[dummy hash for webrtc_nonparallel_tests]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", \"android_junit_tests\": \"[dummy hash for android_junit_tests]\", \"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", \"libjingle_peerconnection_android_unittest\": \"[dummy hash for libjingle_peerconnection_android_unittest]\", \"modules_tests\": \"[dummy hash for modules_tests]\", \"modules_unittests\": \"[dummy hash for modules_unittests]\", \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", \"rtc_stats_unittests\": \"[dummy hash for rtc_stats_unittests]\", \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", \"tools_unittests\": \"[dummy hash for tools_unittests]\", \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\", \"webrtc_nonparallel_tests\": \"[dummy hash for webrtc_nonparallel_tests]\"}@@@"
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"AppRTCMobileTest\": \"[dummy hash for AppRTCMobileTest]\", \"audio_decoder_unittests\": \"[dummy hash for audio_decoder_unittests]\", \"common_audio_unittests\": \"[dummy hash for common_audio_unittests]\", \"common_video_unittests\": \"[dummy hash for common_video_unittests]\", \"libjingle_peerconnection_android_unittest\": \"[dummy hash for libjingle_peerconnection_android_unittest]\", \"modules_tests\": \"[dummy hash for modules_tests]\", \"modules_unittests\": \"[dummy hash for modules_unittests]\", \"peerconnection_unittests\": \"[dummy hash for peerconnection_unittests]\", \"rtc_stats_unittests\": \"[dummy hash for rtc_stats_unittests]\", \"rtc_unittests\": \"[dummy hash for rtc_unittests]\", \"system_wrappers_unittests\": \"[dummy hash for system_wrappers_unittests]\", \"test_support_unittests\": \"[dummy hash for test_support_unittests]\", \"tools_unittests\": \"[dummy hash for tools_unittests]\", \"video_engine_tests\": \"[dummy hash for video_engine_tests]\", \"voice_engine_unittests\": \"[dummy hash for voice_engine_unittests]\", \"webrtc_nonparallel_tests\": \"[dummy hash for webrtc_nonparallel_tests]\"}@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/tools/swarming_client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ skipping 2296 matching lines @@
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]