am 0850d623: am c1ac828e: am 56f85dcd: am fd8bfe07: am d56ad65d: Merge "FileSystemPermissionTest: add directories" into jb-dev

# Via Android Git Automerger (4) and others
* commit '0850d623661794e88342f5c1feb72222353c1a6a':
  FileSystemPermissionTest: add directories