Merge "FileSystemPermissionTest: Add directories."