Merge version 13.0.0+r24-1+rpi1 and 13.0.0+r24-2 to produce 13.0.0+r24-2+rpi1

diff --cc debian/changelog
index c7497dffc58c5904b2a081e748d35dceaa8e2d7c,216648872404511a350572d94c2e32d976571ce8..2d2d9552697ea3d7891b57f86eed1188b14a47c5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- android-platform-external-boringssl (13.0.0+r24-1+rpi1) bookworm-staging; urgency=medium
++android-platform-external-boringssl (13.0.0+r24-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 10.0.0+r36-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 19 Jan 2021 16:01:40 +0000]
 +  * Mark asm as armv6 to avoid setting off armv7 contamination checker.
 +  * set __ARM_MAX_ARCH__ to 6.
 +  * disable HWAES define.
 +  * disable GHASH_ASM_ARM define.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jan 2023 02:00:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Jan 2023 23:35:28 +0000
++
+ android-platform-external-boringssl (13.0.0+r24-2) unstable; urgency=medium
+ 
+   * debian/patches: Refresh again.
+   * debian/rules: Add script to import new upstream.
+   * debian/lintian-overrides: Add mips*el specific tag.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Tue, 17 Jan 2023 21:08:43 -0800
  
  android-platform-external-boringssl (13.0.0+r24-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 3d32f4ce0ac1869b8f6c341fdd72be7ea3882d99,b93aa223e2a22ee08ec6956e1d23db9153fa5527..02703208260f06c2d573185d06cf7c3b8b51857c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,3 +1,4 @@@
  01-Add-new-Arch-ia64-riscv64-sh4-x32.patch
  02-sources-mk.patch
- 0003-Disable-failing-test.patch
+ 03-Disable-failing-test.patch
 +armv6.patch