Merge "Revert "Update zlib to 1.2.11"" am: 30595680d9
am: f8a29d387a

Change-Id: I224beec1d202519d29b1b8a2009297465d803eef