Merge "Replace mkdirs() with setupAppDir()."