MFC: MFV: zlib 1.3.1.
Approved by: re (cperciva, expedited MFC)
(cherry picked from commit 6255c67c3d1a268535c50de74d3300fd86d8f15d)