Merge version 11.0.0+r48-3+rpi1 and 11.0.0+r48-4 to produce 11.0.0+r48-4+rpi1

diff --cc debian/changelog
index a9d2daa088f0336490052ba9329dc41c414e6a4f,7ebe4698dea689e76b8878964d88156c4f3d3d40..d5ec0ee8e715216d400a692cc8bd5904f3b0f4d8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,27 @@@
- android-platform-art (11.0.0+r48-3+rpi1) bookworm-staging; urgency=medium
++android-platform-art (11.0.0+r48-4+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 11.0.0+r48-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 19 Jul 2022 11:20:55 +0000]
 +  * Disable arm-specific codepaths which fail to build on raspbian.
 +  * Disable code that depends on said arm specific codepaths, limit
 +    built to cross-platform code.
 +  * Fix clean target.
 +  * Don't pass -mfpu=neon
 +  * Don't build with clang due to armv7 contamination.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 19 Jul 2022 11:20:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 19 Oct 2022 02:56:48 +0000
++
+ android-platform-art (11.0.0+r48-4) unstable; urgency=medium
+ 
+   [ 殷啟聰 | Kai-Chung Yan ]
+   * Remove myself from Uploaders
+ 
+   [ Jochen Sprickerhof ]
+   * Add patch to fix FTBFS (Closes: #1017143)
+   * Fix lintian upstream-metadata-field-unknown
+   * Disable LTO as the package uses clang and FTBFS (Closes: #1015353)
+   * Add myself to Uploaders
+ 
+  -- Jochen Sprickerhof <jspricke@debian.org>  Thu, 13 Oct 2022 20:56:25 +0200
  
  android-platform-art (11.0.0+r48-3) unstable; urgency=medium
  

diff --cc debian/control
index b014505b7bf0e45fb150aa02fb649bbda5f0b755,656ff4e4cda8fc8f58a068ccfcbf2c2efeaf0296..5a269676fdfbf51c6a5d447d8e48d54c0a63e8cb
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,12 -2,12 +2,12 @@@ Source: android-platform-ar
  Section: devel
  Priority: optional
  Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
- Uploaders: Kai-Chung Yan <seamlik@debian.org>
+ Uploaders: Jochen Sprickerhof <jspricke@debian.org>
  Build-Depends:
 - android-libbacktrace-dev (>= 1:29) [amd64 i386 armhf arm64],
 - android-libcutils-dev (>= 1:29) [amd64 i386 armhf arm64],
 - android-libnativehelper-dev (>= 29) [amd64 i386 armhf arm64],
 - android-libziparchive-dev (>= 1:29) [amd64 i386 armhf arm64],
 + android-libbacktrace-dev (>= 1:29) [amd64 i386 arm64],
 + android-libcutils-dev (>= 1:29) [amd64 i386 arm64],
 + android-libnativehelper-dev (>= 29) [amd64 i386 arm64],
 + android-libziparchive-dev (>= 1:29) [amd64 i386 arm64],
   clang [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
   debhelper-compat (= 12),
   dh-exec,

diff --cc debian/rules
Simple merge