[automerger skipped] Merge "Remove obsolete zlib headers." am: cb5eb1f0b4 am: 8a51def067 -s ours

am skip reason: Change-Id I320a6be58e1cb6f82f66d3931a7f55ec6de64605 with SHA-1 86244f380c is in history

Change-Id: I8bd89af25469960057cb11bb61b7831c031545be