Revert "Revert "Use our vold""

This reverts commit f9be75c63bd59f4bb9b261f905d85e50421bfbb0.