rzlib related build fix.
Merge branch 'rzlib_related_build_fix'