diff --git a/local/install_python_deps_linux.bash b/local/install_python_deps_linux.bash
index 0c24616ab62..80e18b5b2de 100755
--- a/local/install_python_deps_linux.bash
+++ b/local/install_python_deps_linux.bash
@@ -27,23 +27,30 @@ source "$(${PYTHON} -m pipenv --venv)/bin/activate"
 
 if [ $install_android_emulator ]; then
   ANDROID_SDK_INSTALL_DIR=local/bin/android-sdk
-  ANDROID_SDK_REVISION=4333796
-  ANDROID_VERSION=28
-  ANDROID_TOOLS_BIN=$ANDROID_SDK_INSTALL_DIR/tools/bin/
+  ANDROID_SDK_REVISION=11076708
+  ANDROID_VERSION=34
+  ANDROID_TOOLS_BIN=$ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest/bin/
 
   # Install the Android emulator and its dependencies. Used in tests and as an
   # option during Android test case reproduction.
   rm -rf $ANDROID_SDK_INSTALL_DIR
-  mkdir $ANDROID_SDK_INSTALL_DIR
-  curl https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_REVISION.zip \
-      --output $ANDROID_SDK_INSTALL_DIR/sdk-tools-linux.zip
-  unzip -d $ANDROID_SDK_INSTALL_DIR $ANDROID_SDK_INSTALL_DIR/sdk-tools-linux.zip
+  mkdir -p $ANDROID_SDK_INSTALL_DIR
+  curl https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_REVISION}_latest.zip \
+      --output $ANDROID_SDK_INSTALL_DIR/cmdline-tools.zip
+  unzip -d $ANDROID_SDK_INSTALL_DIR $ANDROID_SDK_INSTALL_DIR/cmdline-tools.zip
+  
+  # The new cmdline-tools expects to be in a directory named 'latest' or 'version'
+  # to find its own root.
+  mv $ANDROID_SDK_INSTALL_DIR/cmdline-tools $ANDROID_SDK_INSTALL_DIR/temp
+  mkdir -p $ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest
+  mv $ANDROID_SDK_INSTALL_DIR/temp/* $ANDROID_SDK_INSTALL_DIR/cmdline-tools/latest/
+  rm -rf $ANDROID_SDK_INSTALL_DIR/temp
 
+  yes | $ANDROID_TOOLS_BIN/sdkmanager --licenses
   $ANDROID_TOOLS_BIN/sdkmanager "emulator"
-  $ANDROID_TOOLS_BIN/sdkmanager "platform-tools" "platforms;android-$ANDROID_VERSION"
-  $ANDROID_TOOLS_BIN/sdkmanager "system-images;android-$ANDROID_VERSION;google_apis;x86"
-  $ANDROID_TOOLS_BIN/sdkmanager --licenses
-  $ANDROID_TOOLS_BIN/avdmanager create avd --force -n TestImage -k "system-images;android-$ANDROID_VERSION;google_apis;x86"
+  $ANDROID_TOOLS_BIN/sdkmanager "platform-tools" "platforms;android-$ANDROID_VERSION" "build-tools;$ANDROID_VERSION.0.0"
+  $ANDROID_TOOLS_BIN/sdkmanager "system-images;android-$ANDROID_VERSION;google_apis;x86_64"
+  $ANDROID_TOOLS_BIN/avdmanager create avd --force -n TestImage -k "system-images;android-$ANDROID_VERSION;google_apis;x86_64"
 fi
 
 # Install other dependencies (e.g. bower).
diff --git a/resources/platform/android/adb b/resources/platform/android/adb
index ee2dd1b7531..c25af4d4655 100755
Binary files a/resources/platform/android/adb and b/resources/platform/android/adb differ
diff --git a/resources/platform/android/fastboot b/resources/platform/android/fastboot
index 125f757ac7c..756c7e504ea 100755
Binary files a/resources/platform/android/fastboot and b/resources/platform/android/fastboot differ