am 56f85dcd: am fd8bfe07: am d56ad65d: Merge "FileSystemPermissionTest: add directories" into jb-dev # Via Android Git Automerger (2) and others * commit '56f85dcd': FileSystemPermissionTest: add directories