vold: Fix build for minivold and general cleanup

Change-Id: Ibc450dd86b77a0c4a25de08b2f07dfb9b2c70871
Merge branch 'cm' into HEAD