Merge "Build connectivity JNI against libc++_static"