Replace EnsureDirExists with a call to setupAppDir am: 75973cb0dd

Change-Id: I7cc9c77bd27c459684698069cd85f544d8cb2571