Download the Android SDK as a CIPD package

scripts/slave/recipes/skia/swarm_test.expected/download_and_push_skimage.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
       "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 45 matching lines @@
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_EXCEPTION@@@"
     ]
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for device (1)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for charge (1)"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "echo",
       "$EXTERNAL_STORAGE"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "get EXTERNAL_STORAGE dir",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "root"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "adb root",
@@ skipping 11 matching lines @@
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for device (2)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for charge (2)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/android_kill_skia",
       "--verbose"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "kill skia"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "stop"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "stop shell"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "dumpsys",
       "batteryproperties"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "starting battery stats"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "cat scaling_governor"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "cat cpu_freq"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
       "--verbose",
       "[SLAVE_BUILD]/skia/resources",
       "/storage/emulated/legacy/skiabot/skia_resources"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "push resources"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/tmp/SKP_VERSION",
       "/path/to/tmp/"
     ],
     "name": "Get downloaded SKP_VERSION"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/SKP_VERSION"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "read SKP_VERSION",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
       "/path/to/tmp/"
     ],
     "name": "Get downloaded SK_IMAGE_VERSION"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "cat",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "read SK_IMAGE_VERSION",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "rm",
       "-f",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "rm SK_IMAGE_VERSION"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "rm",
       "-r",
       "/storage/emulated/legacy/skiabot/skia_images"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "rmdir skia_images"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "if",
       "[",
       "-e",
       "/storage/emulated/legacy/skiabot/skia_images",
       "];",
       "then",
       "echo",
       "FILE_EXISTS;",
       "fi"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "exists skia_images",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "mkdir",
       "-p",
       "/storage/emulated/legacy/skiabot/skia_images"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "mkdir skia_images"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_push_if_needed",
       "--verbose",
       "[SLAVE_BUILD]/images",
       "/storage/emulated/legacy/skiabot/skia_images"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "push images"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "push",
       "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/SK_IMAGE_VERSION"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
@@ skipping 39 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
       "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
       "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "rm",
       "-r",
       "/storage/emulated/legacy/skiabot/skia_dm"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "rmdir skia_dm"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "if",
       "[",
       "-e",
       "/storage/emulated/legacy/skiabot/skia_dm",
       "];",
       "then",
       "echo",
       "FILE_EXISTS;",
       "fi"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "exists skia_dm",
     "stdout": "/path/to/tmp/"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "mkdir",
       "-p",
       "/storage/emulated/legacy/skiabot/skia_dm"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
@@ skipping 68 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@    if retry == RETRIES:@@@",
       "@@@STEP_LOG_LINE@python.inline@      raise@@@",
       "@@@STEP_LOG_LINE@python.inline@    waittime = WAIT_BASE * math.pow(2, retry)@@@",
       "@@@STEP_LOG_LINE@python.inline@    print 'Retry in %d seconds.' % waittime@@@",
       "@@@STEP_LOG_LINE@python.inline@    time.sleep(waittime)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "push",
       "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
@@ skipping 45 matching lines @@
       "os",
       "Android",
       "--uninterestingHashesFile",
       "/storage/emulated/legacy/skiabot/skia_tmp_dir/uninteresting_hashes.txt",
       "--writePath",
       "/storage/emulated/legacy/skiabot/skia_dm",
       "--nocpu",
       "--dummy-flags"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "dm"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_pull_if_needed",
       "--verbose",
       "/storage/emulated/legacy/skiabot/skia_dm",
       "[CUSTOM_[SWARM_OUT_DIR]]/dm"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "pull skia_dm"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "shell",
       "dumpsys",
       "batteryproperties"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "final battery stats"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "reboot"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "reboot"
@@ skipping 10 matching lines @@
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for reboot"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_device"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for device (3)"
   },
   {
     "cmd": [
       "[SLAVE_BUILD]/skia/platform_tools/android/bin/adb_wait_for_charge"
     ],
     "env": {
-      "ANDROID_HOME": "[SLAVE_BUILD]/android-sdk",
-      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android-sdk",
+      "ANDROID_HOME": "[SLAVE_BUILD]/android_sdk/android-sdk",
+      "ANDROID_SDK_ROOT": "[SLAVE_BUILD]/android_sdk/android-sdk",
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_ANDROID_VERBOSE_SETUP": "1",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "wait for charge (3)"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/android-sdk/platform-tools/adb",
+      "[SLAVE_BUILD]/android_sdk/android-sdk/platform-tools/adb",
       "kill-server"
     ],
     "env": {
       "BUILDTYPE": "Debug",
       "CHROME_HEADLESS": "1",
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0",
       "PYTHONPATH": "[BUILD]/scripts",
       "SKIA_OUT": "[SLAVE_BUILD]/out"
     },
     "name": "kill-server"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]