Merge branch 'upstream-zlib' into update-zlib

* upstream-zlib:
  zlib 2022-03-27 (21767c65)