mkdir needs -p in some cases

Change-Id: I55ddfbd512141ef089c402556c7ced03a4658ec2