Merge "Use the global bug 24465209 workaround." into main am: 345c29efd8 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/3137473 Change-Id: Ie9f06aba863e5425bdbc57607fc16a1eeb9d8c49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>