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

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



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