Merge "Move jni file descriptor helper code to libnetjniutils"