Merge "Reland (again) "Enable the various chrome zlib optimizations."" am: 7dfceb664e am: cd31e39136

Change-Id: Iba43001390d969ec4e950992502d520df3a67da9