Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48
am: 6a82bc228a

Change-Id: I8e1687131deca82302246fd4f05d0f6e48c5301f