Merge "Split connectivity JNI and service jar"