Revert "vold: Clean up warnings"

This reverts commit 080517da784376126c7122d7271fff5fc67724a1.