am 129a2b5c: am 0f377c07: am 833122f3: Merge "FileSystemPermissionTest: Add directories."

* commit '129a2b5c7e994e2a82729dbfc8be5accc97c1a96':
  FileSystemPermissionTest: Add directories.