Merge "Remove obsolete zlib headers." am: cb5eb1f0b4

Change-Id: Iad6fd1637057198dd81a91eb8b71b6e3c065b218