Revert "Revert "Merge patch series "zlib: Address CVE-2016-9841"""

Now that the release has happened, bring back the update to zlib.

This reverts commit bbacdd3e.

Signed-off-by: Tom Rini <trini@konsulko.com>