Merge "Use libz directly from the NDK." into rvc-dev-plus-aosp