* Imported zlib 1.2.5; merged local changes. From-SVN: r184805
PR libgcj/14856: * Imported zlib 1.2.1; merged local changes. From-SVN: r88898
From-SVN: r26770