merge run and check-rc steps

infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json

 [
   {
     "cmd": [
       "adb",
       "shell",
       "mkdir",
       "-p",
       "/sdcard/revenge_of_the_skiabot/resources"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 512 matching lines @@
     "cmd": [
       "adb",
       "logcat",
       "-c"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "clear log"
   },
   {
     "cmd": [
-      "adb",
-      "shell",
-      "sh",
-      "/data/local/tmp/dm.sh"
-    ],
-    "cwd": "[SLAVE_BUILD]/skia",
-    "name": "dm"
-  },
-  {
-    "cmd": [
-      "adb",
-      "logcat",
-      "-d"
-    ],
-    "cwd": "[SLAVE_BUILD]/skia",
-    "name": "dump log "
-  },
-  {
-    "cmd": [
       "python",
       "-u",
-      "\nimport subprocess\nimport sys\nsys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n                                      '/data/local/tmp/rc'])))\n"
+      "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh      = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n  sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n                                        bin_dir + 'rc'])))\nexcept ValueError:\n  print \"Couldn't read the return code.  Probably killed for OOM.\"\n  sys.exit(1)\n",
+      "/data/local/tmp/",
+      "dm.sh"
     ],
-    "name": "check dm rc",
+    "name": "dm",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@",
-      "@@@STEP_LOG_LINE@python.inline@                                      '/data/local/tmp/rc'])))@@@",
+      "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@sh      = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@",
+      "@@@STEP_LOG_LINE@python.inline@                                        bin_dir + 'rc'])))@@@",
+      "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print \"Couldn't read the return code.  Probably killed for OOM.\"@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit(1)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "adb",
       "pull",
       "/sdcard/revenge_of_the_skiabot/dm_out",
       "[CUSTOM_[SWARM_OUT_DIR]]/dm"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "pull /sdcard/revenge_of_the_skiabot/dm_out [CUSTOM_[SWARM_OUT_DIR]]/dm"
   },
   {
     "cmd": [
       "adb",
+      "logcat",
+      "-d"
+    ],
+    "cwd": "[SLAVE_BUILD]/skia",
+    "name": "dump log"
+  },
+  {
+    "cmd": [
+      "adb",
       "reboot"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "reboot"
   },
   {
     "cmd": [
       "adb",
       "kill-server"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "kill adb server"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]