Merge "Enable the various chrome zlib optimizations."
am: a9da32b4ff

Change-Id: If16329e5bc0e75ff582aa563ec4806c7c6674c42