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

diff --cc debian/changelog
index 10a9f6b317f103c054a7cae0b91fb0a43d0ce751,189ae7bff6c01133025a186f8097c6b19eb89ea2..612f53e3517d5f5f27c1fac0a5d386beef2f40a1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- android-platform-tools (29.0.6-19+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-21+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Jul 2022 01:48:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Aug 2022 10:22:25 +0000
++
+ android-platform-tools (29.0.6-21) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/{control,rules}: Sync with debian/exp branch.
+   * debian/rules: Export gdwarf-4 instead of ignoring dwz
+     (Closes: #1016468, #1015355).
+ 
+  -- Roger Shimizu <rosh@debian.org>  Wed, 03 Aug 2022 00:23:27 +0900
+ 
+ android-platform-tools (29.0.6-20) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/system/core/fastboot.mk:
+     - Add usb-1.0 as lib dependency to linker (Closes: #1012892).
+   * debian/rules: Sync with ubuntu that ignoring error from dh_dwz.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Fri, 29 Jul 2022 01:01:55 +0900
  
  android-platform-tools (29.0.6-19) unstable; urgency=medium
  

diff --cc debian/control
index bfe2cc503f97300a76dc33b6b39dd345975abb92,208ed82f7234687f4715c71d2aaf407a5c314e00..a00eddedb6ddaf8a0dea33117d50b13228958fd6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,11 -4,12 +4,12 @@@ Priority: optiona
  Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
  Uploaders: Chirayu Desai <chirayudesai1@gmail.com>
  Build-Depends:
-  android-libboringssl-dev [amd64 i386 armel armhf arm64 mipsel mips64el],
   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),
   dh-exec,
+ Build-Depends-Arch:
+  android-libboringssl-dev [amd64 i386 armel armhf arm64 mipsel mips64el],
   libgtest-dev,
   libpng-dev,
   libsquashfuse-dev [amd64 i386 armel armhf arm64 mipsel mips64el],

diff --cc debian/rules
Simple merge