Fix linking zlib
Apply fix to libclamav/7z/Types.h
Merge remote-tracking branch 'origin/master'
bb#8993 - Rename the STAT macro to CLAMSTAT to avoid name conflicts on AIX