Merge "Reland "Enable the various chrome zlib optimizations."" am: be96c153 am: 11b1b4de am: ac0ff6ee Change-Id: Iddd78b24ed467dd2e80adef860d63abc4b5c7798