Merge "Upgrade zlib to cf333892c34ab6dbaed37c38a1d5aa6da7b2f99d" am: 10c3c697c4 am: ecdae191f3

Change-Id: If1232ea0365a4415d9431c6c219e722de0a2cf71