Merge "FileSystemPermissionTest: add one dir" into gingerbread