Use our vold

Change-Id: Ia6e7aeedc6bb006dcbe1b8135729432c706aeb20