diff -Nru android-platform-tools-29.0.6/debian/art/libart.mk android-platform-tools-29.0.6/debian/art/libart.mk
--- android-platform-tools-29.0.6/debian/art/libart.mk	2022-02-24 16:58:51.000000000 +0000
+++ android-platform-tools-29.0.6/debian/art/libart.mk	2022-03-22 22:49:43.000000000 +0000
@@ -495,7 +495,7 @@
   -Isystem/core/libziparchive/include \
   -Umips \
 
-CC_ASSEMBLY = clang
+CC_ASSEMBLY = clang-11
 ifeq ($(CPU),arm)
   # Clang does not support the `ADRL` instruction. See <https://bugs.llvm.org/show_bug.cgi?id=24350>
   CC_ASSEMBLY = gcc
diff -Nru android-platform-tools-29.0.6/debian/changelog android-platform-tools-29.0.6/debian/changelog
--- android-platform-tools-29.0.6/debian/changelog	2022-02-24 16:58:51.000000000 +0000
+++ android-platform-tools-29.0.6/debian/changelog	2022-03-22 22:50:07.000000000 +0000
@@ -1,3 +1,9 @@
+android-platform-tools (29.0.6-6+rpi1) bookworm-staging; urgency=medium
+
+  * Build with clang-11 to avoid armv7 contamination.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Mar 2022 22:50:07 +0000
+
 android-platform-tools (29.0.6-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru android-platform-tools-29.0.6/debian/control android-platform-tools-29.0.6/debian/control
--- android-platform-tools-29.0.6/debian/control	2022-02-24 16:58:51.000000000 +0000
+++ android-platform-tools-29.0.6/debian/control	2022-03-22 22:50:05.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Chirayu Desai <chirayudesai1@gmail.com>
 Build-Depends:
  bash-completion,
- clang [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
+ clang-11 [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
  debhelper-compat (= 13),
  help2man,
  libicu-dev [amd64 i386 armel armhf arm64],
diff -Nru android-platform-tools-29.0.6/debian/rules android-platform-tools-29.0.6/debian/rules
--- android-platform-tools-29.0.6/debian/rules	2022-02-24 16:58:51.000000000 +0000
+++ android-platform-tools-29.0.6/debian/rules	2022-03-22 22:49:19.000000000 +0000
@@ -22,10 +22,8 @@
 # https://android.googlesource.com/platform/development/+/refs/tags/platform-tools-29.0.6/sdk/plat_tools_source.prop_template
 export PLATFORM_TOOLS_VERSION = 29.0.6
 
-ifneq (, $(shell which clang))
-  export CC=clang
-  export CXX=clang++
-endif
+export CC=clang-11
+export CXX=clang++-11
 
 %:
 	dh $@ --with bash-completion