Use our vold

Change-Id: I0b0973e9587393620e322ac887cf9df3a1b4e28e