Replace EnsureDirExists with a call to setupAppDir am: 75973cb0dd am: c00e508709

Change-Id: I33499481ca340f84317b9b367c708bb02c91b8e1