Merge "Update zlib to 1.2.11"
am: 540b6fc70b

Change-Id: I9f1d6ea808d018fa63536569cf517c4287ce3292