Merge "Peer address can be null, check for null value in jni before calling...

Merge "Peer address can be null, check for null value in jni before calling str2addr/GetStringUTFChars which may crash on some platforms if given null." into main