[Android] Run java unit tests on the android tester bots.

scripts/slave/recipes/android/tester.expected/android_dbg_tests_recipe.json

Index: scripts/slave/recipes/android/tester.expected/android_dbg_tests_recipe.json
diff --git a/scripts/slave/recipes/android/tester.expected/android_dbg_tests_recipe.json b/scripts/slave/recipes/android/tester.expected/android_dbg_tests_recipe.json
index 6a9e364de3a1aac80538286739d1b360887b9059..4418143e00d66472c32101d1a09e87bd5f643ec0 100644
--- a/scripts/slave/recipes/android/tester.expected/android_dbg_tests_recipe.json
+++ b/scripts/slave/recipes/android/tester.expected/android_dbg_tests_recipe.json
@@ -137,7 +137,7 @@
       "-u",
       "[SLAVE_BUILD]/src/build/gyp_chromium",
       "--analyzer",
-      "{\"files\": [\"foo.cc\"], \"targets\": [\"mojo_test_apk\", \"android_webview_test_apk\", \"chrome_shell_test_apk\", \"content_shell_test_apk\", \"base_unittests\", \"breakpad_unittests\", \"cc_unittests\", \"components_unittests\", \"content_browsertests\", \"content_unittests\", \"events_unittests\", \"gl_tests\", \"gpu_unittests\", \"ipc_tests\", \"media_unittests\", \"net_unittests\", \"sandbox_linux_unittests\", \"sql_unittests\", \"sync_unit_tests\", \"ui_unittests\", \"unit_tests\", \"webkit_unit_tests\"]}",
+      "{\"files\": [\"foo.cc\"], \"targets\": [\"mojo_test_apk\", \"android_webview_test_apk\", \"chrome_shell_test_apk\", \"content_shell_test_apk\", \"base_unittests\", \"breakpad_unittests\", \"cc_unittests\", \"components_unittests\", \"content_browsertests\", \"content_unittests\", \"events_unittests\", \"gl_tests\", \"gpu_unittests\", \"ipc_tests\", \"media_unittests\", \"net_unittests\", \"sandbox_linux_unittests\", \"sql_unittests\", \"sync_unit_tests\", \"ui_unittests\", \"unit_tests\", \"webkit_unit_tests\", \"junit_unit_tests\"]}",
       "/path/to/tmp/json"
     ],
     "env": {
@@ -148,12 +148,14 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"build_targets\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"breakpad_unittests\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"chrome_shell_test_apk\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"chrome_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"junit_unit_tests\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ], @@@",
       "@@@STEP_LOG_LINE@json.output@  \"status\": \"Found dependency\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    \"breakpad_unittests\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"chrome_shell_test_apk\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"chrome_shell_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"junit_unit_tests\"@@@",
       "@@@STEP_LOG_LINE@json.output@  ]@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
@@ -186,7 +188,8 @@
       "[BUILD]/goma",
       "--",
       "breakpad_unittests",
-      "chrome_shell_test_apk"
+      "chrome_shell_test_apk",
+      "junit_unit_tests"
     ],
     "env": {
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
@@ -310,6 +313,21 @@
     "cmd": [
       "python",
       "-u",
+      "[SLAVE_BUILD]/src/build/android/test_runner.py",
+      "junit",
+      "-s",
+      "junit_unit_tests",
+      "--verbose"
+    ],
+    "env": {
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "junit_unit_tests"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
       "--output-path",
       "[SLAVE_BUILD]/src/out/Debug/full_log",