sudo is not needed to make these dirs as
we create them in prepare

Change-Id: Ie2f225bdd16a036473c7412f9d957709af3777f5
Merge "sudo is not needed to make these dirs as we create them in prepare"