Add new clean step for recent vold changes

Vold crashes on a non clobber build after recent changes

Change-Id: I909f5a8b0533f0ad12b69a779038756a296fb4dc
Merge branch 'cm' into HEAD