Revert "Update zlib to 1.2.11" am: 20877b3d8f
am: 6b637b605d

Change-Id: I51dff489ed02e981ddac23eb1098d43c784d6e5f