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