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

Change-Id: I27c49899aee86c8d7a0df4ebd88e31ebb811b102