Merge branch 'upstream-zstd' into update-zstd

* upstream-zstd:
  zstd 2023-04-04 (63779c79)