Revert "Switch remaining bots to new Telemetry GPU isolate."

scripts/slave/recipes/gpu/build_and_test.expected/win_release_fyi.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]\\scripts\\slave\\cleanup_temp.py"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "cleanup temp"
   },
@@ skipping 130 matching lines @@
       "--goma-dir",
       "[BUILD]\\goma",
       "--",
       "angle_unittests_run",
       "content_gl_tests_run",
       "gl_tests_run",
       "gl_unittests_run",
       "gles2_conform_test_run",
       "gpu_unittests_run",
       "tab_capture_end2end_tests_run",
-      "telemetry_gpu_new_test_run",
+      "telemetry_gpu_test_run",
       "audio_unittests_run",
       "content_unittests_run",
       "angle_end2end_tests_run",
+      "telemetry_gpu_new_test_run",
       "angle_deqp_gles2_tests_run",
       "angle_deqp_gles3_tests_run"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "compile",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
       "@@@STEP_LOG_END@json.output (invalid)@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[isolate]\\resources\\isolate.py",
       "[SLAVE_BUILD]\\src\\tools\\swarming_client",
       "batcharchive",
       "--dump-json",
       "/path/to/tmp/json",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "[SLAVE_BUILD]\\src\\out\\Release\\angle_unittests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\content_gl_tests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\gl_tests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\gl_unittests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\gles2_conform_test.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\gpu_unittests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\tab_capture_end2end_tests.isolated.gen.json",
-      "[SLAVE_BUILD]\\src\\out\\Release\\telemetry_gpu_new_test.isolated.gen.json",
+      "[SLAVE_BUILD]\\src\\out\\Release\\telemetry_gpu_test.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\audio_unittests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\content_unittests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\angle_end2end_tests.isolated.gen.json",
+      "[SLAVE_BUILD]\\src\\out\\Release\\telemetry_gpu_new_test.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\angle_deqp_gles2_tests.isolated.gen.json",
       "[SLAVE_BUILD]\\src\\out\\Release\\angle_deqp_gles3_tests.isolated.gen.json"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "isolate tests",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_deqp_gles2_tests\": \"[dummy hash for angle_deqp_gles2_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_deqp_gles3_tests\": \"[dummy hash for angle_deqp_gles3_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_end2end_tests\": \"[dummy hash for angle_end2end_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"angle_unittests\": \"[dummy hash for angle_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"audio_unittests\": \"[dummy hash for audio_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"content_unittests\": \"[dummy hash for content_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_tests\": \"[dummy hash for gl_tests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gl_unittests\": \"[dummy hash for gl_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
-      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"angle_deqp_gles2_tests\": \"[dummy hash for angle_deqp_gles2_tests]\", \"angle_deqp_gles3_tests\": \"[dummy hash for angle_deqp_gles3_tests]\", \"angle_end2end_tests\": \"[dummy hash for angle_end2end_tests]\", \"angle_unittests\": \"[dummy hash for angle_unittests]\", \"audio_unittests\": \"[dummy hash for audio_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"content_unittests\": \"[dummy hash for content_unittests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\"}@@@"
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"angle_deqp_gles2_tests\": \"[dummy hash for angle_deqp_gles2_tests]\", \"angle_deqp_gles3_tests\": \"[dummy hash for angle_deqp_gles3_tests]\", \"angle_end2end_tests\": \"[dummy hash for angle_end2end_tests]\", \"angle_unittests\": \"[dummy hash for angle_unittests]\", \"audio_unittests\": \"[dummy hash for audio_unittests]\", \"content_gl_tests\": \"[dummy hash for content_gl_tests]\", \"content_unittests\": \"[dummy hash for content_unittests]\", \"gl_tests\": \"[dummy hash for gl_tests]\", \"gl_unittests\": \"[dummy hash for gl_unittests]\", \"gles2_conform_test\": \"[dummy hash for gles2_conform_test]\", \"gpu_unittests\": \"[dummy hash for gpu_unittests]\", \"tab_capture_end2end_tests\": \"[dummy hash for tab_capture_end2end_tests]\", \"telemetry_gpu_new_test\": \"[dummy hash for telemetry_gpu_new_test]\", \"telemetry_gpu_test\": \"[dummy hash for telemetry_gpu_test]\"}@@@"
     ]
   },
   {
     "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
       "[BUILD]\\scripts\\slave\\runtest.py",
       "--target",
       "Release",
@@ skipping 818 matching lines @@
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "gpu_unittests"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]