Fix libz.so.
Merge topic 'cross-compiling-toolchain-variables' into next

1ebe6fe Fix libz.so.