Merge "imgpatch: Compile with ZLIB_CONST defined."
am: e78ca37656

Change-Id: I636cfadd456cb6e256049a23f70e3a7a71c70d78