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

* commit '469b6955a8ee5039a61eb195a034684f513f6b21':
  Fix various errors in FileURLConnectionTest.