Merge "Define ZLIB_CONST to add constness." am: 359dfd46c0 am: d3551e86bb
am: e157ee83e7

Change-Id: If9559714274dc05865fc8ad893170cf9a6567147