Merge "Android-ify SocketOptions.IP_MULTICAST_IF2" into nyc-dev