* Imported zlib 1.2.5; merged local changes. From-SVN: r184805
which included commits to RCS files with non-trunk default branches. From-SVN: r104182
From-SVN: r88890