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

diff --cc debian/changelog
index 10a9f6b317f103c054a7cae0b91fb0a43d0ce751,8398d02f843ea864cc15de5f1843615da329b9de..cb2918c183672da5c08731f3ac0f5398f76f6eef
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- android-platform-tools (29.0.6-19+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-20+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>  Sat, 06 Aug 2022 16:37:05 +0000
++
+ 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/rules
Simple merge