Merge pull request #5748 from lhchavez/chromium-zlib zlib: Add support for building with Chromium's zlib implementation