Merge "Reland (again) "Enable the various chrome zlib optimizations."" am: 7dfceb66 am: cd31e391 Change-Id: Iba43001390d969ec4e950992502d520df3a67da9