* Imported zlib 1.2.8; merged local changes. From-SVN: r230774
* Imported zlib 1.2.5; merged local changes. From-SVN: r184805
From-SVN: r104179