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

Change-Id: I2de5cbd93de5c876b8fcbfd02efe7c7d401b7537