Merge "File: Test file-system encodings of files."