Merge version 29.0.6-21+rpi1 and 29.0.6-22 to produce 29.0.6-22+rpi1

diff --cc debian/changelog
index 612f53e3517d5f5f27c1fac0a5d386beef2f40a1,aaca8e700ee8705331bcb8983d9b755610321c08..81e78648c50fbc292f3f91f443fdf5444a104fc2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- android-platform-tools (29.0.6-21+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-22+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 29.0.6-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Mar 2022 22:50:07 +0000]
 +  * Build with clang-11 to avoid armv7 contamination.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Aug 2022 10:22:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Jan 2023 10:21:42 +0000
++
+ android-platform-tools (29.0.6-22) unstable; urgency=medium
+ 
+   * Team upload.
+   * Add patch to fix FTBFS (Closes: #1027653)
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Wed, 11 Jan 2023 09:19:44 +0100
  
  android-platform-tools (29.0.6-21) unstable; urgency=medium