Revert "[CMake] Simplify CMake handling for zlib"

This reverts commit 1adc494b.
This patch broke the Windows compilation on buildbot and pre-merge testing:
http://lab.llvm.org:8011/builders/mlir-windows/builds/5945
https://buildkite.com/llvm-project/llvm-master-build/builds/780