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

# Via Android (Google) Code Review (1) and others
* commit 'fd8bfe07a4438a63589e0f2c28d840355f3c0aa0':
  FileSystemPermissionTest: add directories