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

diff --cc debian/changelog
index 81e78648c50fbc292f3f91f443fdf5444a104fc2,ffc10bc3adefa1e6429b50f558c53b457f14c5bb..3fb30d76f393fe8e721113d15a01fb2d7ee00304
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- android-platform-tools (29.0.6-22+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-23+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>  Tue, 17 Jan 2023 10:21:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Jan 2023 23:15:57 +0000
++
+ android-platform-tools (29.0.6-23) unstable; urgency=medium
+ 
+   * Fix CVE-2022-20128 and CVE-2022-3168
+   * debian/source/lintian-overrides: Fix lintian.
+   * Apply multi-arch hints
+   * Sync with experimental to support adb and fastboot on ppc64el.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Fri, 20 Jan 2023 00:36:41 -0800
  
  android-platform-tools (29.0.6-22) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge