Merge "Fix various errors in FileURLConnectionTest."