Merge "Suppress deprecated-non-prototype warnings" am: ca4c33b4 am: e3455e1e am: b3299445

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2184336



Change-Id: I814a2db298027e81c7c2fd8cedd635e6c9ee4a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>