vold: Fix build for minivold and general cleanup

Change-Id: Ieca6e71a9affbf0fff3fd730fa4fa32ee5321d01