Merge "Remove obsolete zlib headers." into rvc-dev-plus-aosp am: 8fb7fd1d0e

Change-Id: Iacfd8d97e912d37e4ef71e1bc4268399e897db88