Merge "Reland "Enable the various chrome zlib optimizations."" am: be96c1531e

Change-Id: Iefe770edcbc938a69da8f0f4e3e9f19beb776bab