Merge "Add a libz_current static lib for NDK builds."