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

# Via Android Git Automerger (5) and others
* commit 'd425e8d29ad6d5e3d0a593cfd3dcab20dac6391e':
  FileSystemPermissionTest: add directories