[Android] Default to test name as compile target for instrumentation tests.

scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json

Index: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json
similarity index 97%
copy from scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
copy to scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json
index e9ad5cf594294de667030a6f7daa79e968122f36..d346e0efa5034fa7034b2de1d1974e1cb4dc4340 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_nodefault_test.json
@@ -225,13 +225,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"Android Tests\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"instrumentation_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"additional_apks\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@          \"another_apk\", @@@",
-      "@@@STEP_LOG_LINE@json.output@          \"omg_so_many_apks\"@@@",
-      "@@@STEP_LOG_LINE@json.output@        ], @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"apk_under_test\": \"second_apk\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"ChromePublicTest\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test_apk\": \"one_apk\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"test\": \"blimp_test_apk\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -555,14 +549,14 @@
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk",
+      "[SLAVE_BUILD]/src/out/Release/bin/run_blimp_test_apk",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--verbose",
       "--json-results-file",
       "/path/to/tmp/json"
     ],
-    "name": "Instrumentation test ChromePublicTest",
+    "name": "Instrumentation test blimp_test_apk",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
@@ -583,13 +577,13 @@
       "--build-number",
       "571",
       "--test-type",
-      "ChromePublicTest",
+      "blimp_test_apk",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
       "refs/heads/master@{#170242}"
     ],
-    "name": "Upload to test-results [ChromePublicTest]"
+    "name": "Upload to test-results [blimp_test_apk]"
   },
   {
     "cmd": [
@@ -685,7 +679,7 @@
   },
   {
     "name": "$result",
-    "reason": "1 tests failed: ['ChromePublicTest']",
+    "reason": "1 tests failed: ['blimp_test_apk']",
     "status_code": 1
   }
 ]