Revert of webrtc: run tests in the checkout directory

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 223 matching lines @@
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/build/symlink.py",
       "-f",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
       "~/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "create adb symlink"
   },
   {
     "cmd": [
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--",
       "[BUILDER_CACHE]/android_dbg/src/build/android/adb_logcat_monitor.py",
       "[BUILDER_CACHE]/android_dbg/src/out/logcat",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "spawn_logcat_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "authorize_adb_devices"
   },
   {
     "cmd": [
       "[BUILDER_CACHE]/android_dbg/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--known-devices-file",
       "[HOME]/.android/known_devices.json",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
       "-v"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "device_recovery"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/build/android/provision_devices.py",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--output-device-blacklist",
       "/path/to/tmp/json",
       "-t",
       "Debug"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "provision_devices"
   },
   {
     "cmd": [
       "[BUILDER_CACHE]/android_dbg/src/third_party/catapult/devil/devil/android/tools/device_status.py",
       "--json-output",
       "/path/to/tmp/json",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--known-devices-file",
       "[HOME]/.android/known_devices.json",
       "--buildbot-path",
       "/home/chrome-bot/.adb_device_info",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
       "-v",
       "--overwrite-known-devices-files"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "device_status",
     "~followup_annotations": [
       "@@@STEP_TEXT@Online devices: 1@@@",
       "@@@STEP_LOG_LINE@json.output@[@@@",
       "@@@STEP_LOG_LINE@json.output@  {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"device\", @@@",
@@ skipping 96 matching lines @@
       "restart",
       "--pid-file-path",
       "/tmp/device_monitor.pid",
       "--",
       "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
       "[\"07a00ca4\"]",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "spawn_device_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_audio_decoder_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "audio_decoder_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_common_audio_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "common_audio_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_common_video_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "common_video_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_modules_tests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "modules_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_modules_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "modules_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_peerconnection_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "peerconnection_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_rtc_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "rtc_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_system_wrappers_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "system_wrappers_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_test_support_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "test_support_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_tools_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "tools_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_video_engine_tests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "video_engine_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_voice_engine_unittests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "voice_engine_unittests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_webrtc_nonparallel_tests",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "webrtc_nonparallel_tests"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_AppRTCDemoTest",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "AppRTCDemoTest"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
       "--blacklist-file",
       "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
       "--verbose",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "libjingle_peerconnection_android_unittest"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "stop",
       "--pid-file-path",
       "/tmp/device_monitor.pid"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "shutdown_device_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
       "[BUILDER_CACHE]/android_dbg/src/build/android/adb_logcat_printer.py",
       "--output-path",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/full_log",
       "[BUILDER_CACHE]/android_dbg/src/out/logcat"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "logcat_dump"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "--force-version",
       "4.7",
       "-o",
       "GSUtil:parallel_composite_upload_threshold=50M",
       "----",
       "cp",
       "-a",
       "public-read",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/full_log",
       "gs://chromium-android/logcat_dumps/android_dbg/1337"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "gsutil upload",
     "~followup_annotations": [
       "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_dbg/1337@@@"
     ]
   },
   {
     "cmd": [
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_platform/development/scripts/stack",
       "--arch",
       "arm",
       "--more-info",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/full_log"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_dbg/src/out/Debug",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "stack_tool_with_logcat_dump"
   },
   {
     "cmd": [
       "[BUILDER_CACHE]/android_dbg/src/build/android/tombstones.py",
       "-a",
       "-s",
       "-w",
       "--adb-path",
       "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "env": {
       "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_dbg/src/out/Debug",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
     },
     "name": "stack_tool_for_tombstones"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n  with open(report, 'r') as f:\n    for l in f.readlines():\n      print l\n  os.remove(report)\n",
       "[BUILDER_CACHE]/android_dbg/src/out/Debug/test_logs/*.log"
     ],
-    "cwd": "[BUILDER_CACHE]/android_dbg/src",
+    "cwd": "[BUILDER_CACHE]/android_dbg",
     "name": "test_report",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]