On certain systems, especially when using system-qt/system-python, we'd rather
use system ZLIB as well, especially for building components that don't use
mangled ZLIB. This addresses that issue.

Change-Id: I8190b3d570fe0f2bf9c9b74a13cd3411cdaa6a29