am d56ad65d: Merge "FileSystemPermissionTest: add directories" into jb-dev

# Via Android (Google) Code Review (1) and Nick Kralevich (1)
* commit 'd56ad65dafb8dfbf111cbe8d42c2cbcc593f6e8f':
  FileSystemPermissionTest: add directories