Swap a few os.mkdir calls with utils.EnsureDirs

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Balazs Lecz <leczb@google.com>