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

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



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