* Imported zlib 1.2.7; merged local changes. From-SVN: r193574
* Imported zlib 1.2.5; merged local changes. From-SVN: r184805