Revert "vold: Fix build for minivold and general cleanup"

This reverts commit 96314cfe1048a3136e7671a14e13944798860255.