diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 05eab1c2..db485000 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -44,6 +44,8 @@ prepare() {
   PLATFORM_TOOLS_VERSION="$pkgver" LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja
 
   cd "$srcdir"/core
+  # https://android-review.googlesource.com/c/platform/system/core/+/1123485
+  git cherry-pick -n fbb9535aaea5ae4011f3c3edf4c00b27452f57ec
   patch -p1 < ../fix_build_core.patch
 
   cd "$srcdir"/avb