Merge "Reland "Update zlib to 1.2.11""
am: 3ff5469268

Change-Id: I9c097bd86ae3d088dd402c530b45eb60ee01a29d