Modifies the setSocketOption and getSocketOption to use SockAddr insted of String.
Merge branch 'java-api-fix' into next