Merge "Remove obsolete zlib headers." into rvc-dev-plus-aosp