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

Change-Id: I2c9647f4b5314363cb26a30f180da388fe043615