Merge "Support IPv6 addresses in OldURLStreamHandlerTest."