diff --git a/docs/_getting-started-linux-android.md b/docs/_getting-started-linux-android.md
index 526bdd01a0f..f763bd20369 100644
--- a/docs/_getting-started-linux-android.md
+++ b/docs/_getting-started-linux-android.md
@@ -47,7 +47,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/docs/_getting-started-macos-android.md b/docs/_getting-started-macos-android.md
index 2784423c780..a32f984a81f 100644
--- a/docs/_getting-started-macos-android.md
+++ b/docs/_getting-started-macos-android.md
@@ -88,7 +88,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/docs/_getting-started-windows-android.md b/docs/_getting-started-windows-android.md
index 861d24f440a..110f0974da7 100644
--- a/docs/_getting-started-windows-android.md
+++ b/docs/_getting-started-windows-android.md
@@ -66,7 +66,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.77/_getting-started-linux-android.md b/website/versioned_docs/version-0.77/_getting-started-linux-android.md
index 6a2a95d5f96..21344283679 100644
--- a/website/versioned_docs/version-0.77/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.77/_getting-started-linux-android.md
@@ -43,7 +43,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.77/_getting-started-macos-android.md b/website/versioned_docs/version-0.77/_getting-started-macos-android.md
index c8247927854..8f4b5483672 100644
--- a/website/versioned_docs/version-0.77/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.77/_getting-started-macos-android.md
@@ -84,7 +84,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.77/_getting-started-windows-android.md b/website/versioned_docs/version-0.77/_getting-started-windows-android.md
index 7ea485b92d6..17453d4ba1e 100644
--- a/website/versioned_docs/version-0.77/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.77/_getting-started-windows-android.md
@@ -58,7 +58,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.78/_getting-started-linux-android.md b/website/versioned_docs/version-0.78/_getting-started-linux-android.md
index 6a2a95d5f96..21344283679 100644
--- a/website/versioned_docs/version-0.78/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.78/_getting-started-linux-android.md
@@ -43,7 +43,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.78/_getting-started-macos-android.md b/website/versioned_docs/version-0.78/_getting-started-macos-android.md
index c8247927854..8f4b5483672 100644
--- a/website/versioned_docs/version-0.78/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.78/_getting-started-macos-android.md
@@ -84,7 +84,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.78/_getting-started-windows-android.md b/website/versioned_docs/version-0.78/_getting-started-windows-android.md
index 7ea485b92d6..17453d4ba1e 100644
--- a/website/versioned_docs/version-0.78/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.78/_getting-started-windows-android.md
@@ -58,7 +58,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.79/_getting-started-linux-android.md b/website/versioned_docs/version-0.79/_getting-started-linux-android.md
index 6a2a95d5f96..21344283679 100644
--- a/website/versioned_docs/version-0.79/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.79/_getting-started-linux-android.md
@@ -43,7 +43,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.79/_getting-started-macos-android.md b/website/versioned_docs/version-0.79/_getting-started-macos-android.md
index c8247927854..8f4b5483672 100644
--- a/website/versioned_docs/version-0.79/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.79/_getting-started-macos-android.md
@@ -84,7 +84,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.79/_getting-started-windows-android.md b/website/versioned_docs/version-0.79/_getting-started-windows-android.md
index 7ea485b92d6..17453d4ba1e 100644
--- a/website/versioned_docs/version-0.79/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.79/_getting-started-windows-android.md
@@ -58,7 +58,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.80/_getting-started-linux-android.md b/website/versioned_docs/version-0.80/_getting-started-linux-android.md
index 6a2a95d5f96..21344283679 100644
--- a/website/versioned_docs/version-0.80/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.80/_getting-started-linux-android.md
@@ -43,7 +43,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.80/_getting-started-macos-android.md b/website/versioned_docs/version-0.80/_getting-started-macos-android.md
index c8247927854..8f4b5483672 100644
--- a/website/versioned_docs/version-0.80/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.80/_getting-started-macos-android.md
@@ -84,7 +84,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.80/_getting-started-windows-android.md b/website/versioned_docs/version-0.80/_getting-started-windows-android.md
index 7ea485b92d6..17453d4ba1e 100644
--- a/website/versioned_docs/version-0.80/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.80/_getting-started-windows-android.md
@@ -58,7 +58,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.81/_getting-started-linux-android.md b/website/versioned_docs/version-0.81/_getting-started-linux-android.md
index 165dff02d04..a106ddcd9df 100644
--- a/website/versioned_docs/version-0.81/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.81/_getting-started-linux-android.md
@@ -43,7 +43,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.81/_getting-started-macos-android.md b/website/versioned_docs/version-0.81/_getting-started-macos-android.md
index ecf3e1c18ac..75a37b77edf 100644
--- a/website/versioned_docs/version-0.81/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.81/_getting-started-macos-android.md
@@ -84,7 +84,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.81/_getting-started-windows-android.md b/website/versioned_docs/version-0.81/_getting-started-windows-android.md
index 0d4aa73f905..0a32a5f3534 100644
--- a/website/versioned_docs/version-0.81/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.81/_getting-started-windows-android.md
@@ -58,7 +58,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.82/_getting-started-linux-android.md b/website/versioned_docs/version-0.82/_getting-started-linux-android.md
index 526bdd01a0f..f763bd20369 100644
--- a/website/versioned_docs/version-0.82/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.82/_getting-started-linux-android.md
@@ -47,7 +47,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.82/_getting-started-macos-android.md b/website/versioned_docs/version-0.82/_getting-started-macos-android.md
index 2784423c780..a32f984a81f 100644
--- a/website/versioned_docs/version-0.82/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.82/_getting-started-macos-android.md
@@ -88,7 +88,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.82/_getting-started-windows-android.md b/website/versioned_docs/version-0.82/_getting-started-windows-android.md
index 861d24f440a..110f0974da7 100644
--- a/website/versioned_docs/version-0.82/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.82/_getting-started-windows-android.md
@@ -66,7 +66,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.83/_getting-started-linux-android.md b/website/versioned_docs/version-0.83/_getting-started-linux-android.md
index 526bdd01a0f..f763bd20369 100644
--- a/website/versioned_docs/version-0.83/_getting-started-linux-android.md
+++ b/website/versioned_docs/version-0.83/_getting-started-linux-android.md
@@ -47,7 +47,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.83/_getting-started-macos-android.md b/website/versioned_docs/version-0.83/_getting-started-macos-android.md
index 2784423c780..a32f984a81f 100644
--- a/website/versioned_docs/version-0.83/_getting-started-macos-android.md
+++ b/website/versioned_docs/version-0.83/_getting-started-macos-android.md
@@ -88,7 +88,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` or (for Apple M1 Silicon) `Google APIs ARM 64 v8a System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the "Android SDK Build-Tools" entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.
 
diff --git a/website/versioned_docs/version-0.83/_getting-started-windows-android.md b/website/versioned_docs/version-0.83/_getting-started-windows-android.md
index 861d24f440a..110f0974da7 100644
--- a/website/versioned_docs/version-0.83/_getting-started-windows-android.md
+++ b/website/versioned_docs/version-0.83/_getting-started-windows-android.md
@@ -66,7 +66,7 @@ Select the "SDK Platforms" tab from within the SDK Manager, then check the box n
 - `Android SDK Platform 35`
 - `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image`
 
-Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `35.0.0` is selected.
+Next, select the "SDK Tools" tab and check the box next to "Show Package Details" here as well. Look for and expand the `Android SDK Build-Tools` entry, then make sure that `36.0.0` and `Android SDK Command-line Tools (latest)` are selected.
 
 Finally, click "Apply" to download and install the Android SDK and related build tools.