Merge "Make zlib headers compatible with MSVC" into emu-master-dev