Merge "JNI: Check if service name is null in createSocketChannelNative"