Merge "Remove usage of internal APIs from InetAddress and ServerSocket"