Revert "Revert "vold: Clean up warnings""

This reverts commit 3974acc9e29e6eb982f2472a0d48560584c8adce.