Revert "Revert "Revert "Update Android sdkmanager for all platforms (#13912)" (#13922)" (#13923)" (#13935)

This reverts commit ad898ad03f.

Back to the whiteboard w.r.t. Android SDK licenses.

dev/bots/README.md

@@ -97,12 +97,7 @@ tried, but it's not quite ready.
 
 # Android Tools
 
-The Android SDK and NDK used by Flutter's Chrome infra bots are stored in Google Cloud. During the build a bot runs the
-`download_android_tools.py` script that downloads the required version of the Android SDK into `dev/bots/android_tools`.
-
-To check which components are currently installed, download the current SDK stored in Google Cloud using the
-`download_android_tools.py` script, then `dev/bots/android_tools/sdk/tools/bin/sdkmanager --list`. If you find that some
-components need to be updated or installed, follow the steps below:
+Instructions to update the Android Tools version that the bots download by executing `download_android_tools.py`.
 
 ## How to update Android SDK on Google Cloud Storage
 
@@ -110,16 +105,20 @@ components need to be updated or installed, follow the steps below:
    `$ dev/bots/android_tools/sdk/tools/android update sdk`
    Use `android.bat` on Windows.
 
-2. Use the UI to choose the packages you want to install and/or update.
+2. Choose/Update packages
+   The following packages are currently installed:
+   * Android SDK Tools
+   * Android SDK platform-tools
+   * Android SDK Build-tools 24.0.3
+   * Android 6.0 (API 23)
+     * SDK Platform 23
+   * Extras
+     * Android Support Repository
+     * Google Play services
 
 3. Run upload_android_tools.py -t sdk
    `$ dev/bots/upload_android_tools.py -t sdk`
 
-4. Run `dev/bots/android_tools/sdk/tools/bin/sdkmanager --update`. On Windows, run `sdkmanager.bat` instead. If the
-   process fails with an error saying that it is unable to move files (Windows makes files and directories read-only
-   when another process is holding them open), make a copy of the `dev/bots/android_tools/sdk/tools` directory, run
-   the `sdkmanager.bat` from the copy, and use the `--sdk_root` option pointing at `dev/bots/android_tools/sdk`.
-
 ## How to update Android NDK on Google Cloud Storage
 
 1. Download a new NDK binary (e.g. android-ndk-r10e-linux-x86_64.bin)

dev/bots/VERSION_LINUX_SDK

@@ -1 +1 @@
-0ac20655837a7f178981bd7b0b3e7fa4630ea8aa
+5184094460409fe66dee956cc0ed6b7526cb0743

dev/bots/VERSION_MACOSX_SDK

@@ -1 +1 @@
-2b9f8da89fb805dcef4f0229eb3e677594716481
+cf7e7d4c13ff0c91b52578220b87e0475a51d783

dev/bots/VERSION_WIN_SDK

@@ -1 +1 @@
-15ad0047eb3b7aecf6acb54e0462baac1e518d91
+ca4fb2a0c639990e9cdf4a997ffa759fb76592e9