Merge "external/zlib is now where the NDK headers come from."