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

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

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



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