am 00c64297: am 469b6955: am 567dcb29: Merge "Fix various errors in FileURLConnectionTest."

* commit '00c642971127aa804eca93bf770eb9802fb5a159':
  Fix various errors in FileURLConnectionTest.