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