Merge "Ignore unused parameters in infcover.cc" am: e5b608ab am: 3efba951

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



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