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

Change-Id: I65ddb1ef4b179a3fb52344525bd4e959c392710f