diff -pruN 14.0.0+r15-5/debian/changelog 14.0.0+r15-5ubuntu1/debian/changelog
--- 14.0.0+r15-5/debian/changelog	2025-08-31 07:51:21.000000000 +0000
+++ 14.0.0+r15-5ubuntu1/debian/changelog	2025-09-02 08:36:47.000000000 +0000
@@ -1,3 +1,10 @@
+android-platform-art (14.0.0+r15-5ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/p/fix-ambiguous.patch: Fix FTBFS due to ambiguous FillVRegs template
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 02 Sep 2025 10:36:47 +0200
+
 android-platform-art (14.0.0+r15-5) unstable; urgency=medium
 
   * Team upload.
@@ -33,6 +40,31 @@ android-platform-art (14.0.0+r15-5~exp1)
 
  -- Roger Shimizu <rosh@debian.org>  Sun, 13 Jul 2025 23:57:32 +0200
 
+android-platform-art (14.0.0+r15-4ubuntu3) questing; urgency=medium
+
+  * Add lld on riscv64 to fix a build failure
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 05 Jun 2025 07:34:43 +0200
+
+android-platform-art (14.0.0+r15-4ubuntu2) questing; urgency=medium
+
+  * Rebuild against new clang toolchain.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 04 Jun 2025 05:22:22 +0200
+
+android-platform-art (14.0.0+r15-4ubuntu1) questing; urgency=medium
+
+  * d/p/fix-ambiguous.patch: Fix FTBFS due to ambiguous FillVRegs template
+    specializations due to clang-20.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 03 May 2025 23:40:23 +0100
+
+android-platform-art (14.0.0+r15-4build1) questing; urgency=medium
+
+  * No-change rebuild for libtinyxml2-11.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 03 May 2025 16:19:59 +0000
+
 android-platform-art (14.0.0+r15-4) unstable; urgency=medium
 
   [ Hans-Christoph Steiner ]
diff -pruN 14.0.0+r15-5/debian/patches/fix-ambiguous.patch 14.0.0+r15-5ubuntu1/debian/patches/fix-ambiguous.patch
--- 14.0.0+r15-5/debian/patches/fix-ambiguous.patch	1970-01-01 00:00:00.000000000 +0000
+++ 14.0.0+r15-5ubuntu1/debian/patches/fix-ambiguous.patch	2025-05-03 22:30:34.000000000 +0000
@@ -0,0 +1,40 @@
+Description: Fix ambiguous FillVRegs template specializations due to clang-20
+
+Origin: upstream, https://android.googlesource.com/platform/art/+/d5a09b3adf930729ccb17c1e466c9c5eb053082a
+Bug-Debian: https://bugs.debian.org/1104650
+Last-Update: 2025-05-03
+---
+
+--- android-platform-art-14.0.0+r15.orig/runtime/art_method-inl.h
++++ android-platform-art-14.0.0+r15/runtime/art_method-inl.h
+@@ -151,18 +151,14 @@ constexpr size_t NumberOfVRegs() {
+   return sum;
+ }
+ 
+-template <char... ArgType>
+-inline ALWAYS_INLINE void FillVRegs(uint32_t* vregs ATTRIBUTE_UNUSED,
+-                                    typename ShortyTraits<ArgType>::Type... args ATTRIBUTE_UNUSED)
+-    REQUIRES_SHARED(Locks::mutator_lock_) {}
+-
+ template <char FirstArgType, char... ArgType>
+ inline ALWAYS_INLINE void FillVRegs(uint32_t* vregs,
+                                     typename ShortyTraits<FirstArgType>::Type first_arg,
+                                     typename ShortyTraits<ArgType>::Type... args)
+     REQUIRES_SHARED(Locks::mutator_lock_) {
+   ShortyTraits<FirstArgType>::Set(vregs, first_arg);
+-  FillVRegs<ArgType...>(vregs + ShortyTraits<FirstArgType>::kVRegCount, args...);
++  if constexpr (sizeof...(args) > 0)
++    FillVRegs<ArgType...>(vregs + ShortyTraits<FirstArgType>::kVRegCount, args...);
+ }
+ 
+ template <char... ArgType>
+@@ -170,7 +166,8 @@ inline ALWAYS_INLINE auto MaterializeVRe
+     REQUIRES_SHARED(Locks::mutator_lock_) {
+   constexpr size_t kNumVRegs = NumberOfVRegs<ArgType...>();
+   std::array<uint32_t, kNumVRegs> vregs;
+-  FillVRegs<ArgType...>(vregs.data(), args...);
++  if constexpr (sizeof...(args) > 0)
++    FillVRegs<ArgType...>(vregs.data(), args...);
+   return vregs;
+ }
+ 
diff -pruN 14.0.0+r15-5/debian/patches/series 14.0.0+r15-5ubuntu1/debian/patches/series
--- 14.0.0+r15-5/debian/patches/series	2025-08-31 07:51:21.000000000 +0000
+++ 14.0.0+r15-5ubuntu1/debian/patches/series	2025-08-31 15:48:43.000000000 +0000
@@ -6,3 +6,4 @@ remove-constexpr.patch
 fix-pthread-stack.patch
 remove-include-unused-base-strlcpy-h.patch
 Fix-Filter-function-shadowing-its-own-template-parameter.patch
+fix-ambiguous.patch