Merge "Enable the various chrome zlib optimizations." am: a9da32b4ff am: 99f98798a6 am: 2fe80c6629

Change-Id: Ie09d396172c8e22bd017fd526b4117c1635575ac