Merge "Revert "Enable the various chrome zlib optimizations.""