Merge "Upgrade zlib to cf333892c34ab6dbaed37c38a1d5aa6da7b2f99d" am: 10c3c697c4

Change-Id: Ia345128657e2203d3237e2da356c0f68336099fa