Revert "vold: fix common flags"

This reverts commit 472a31ba9fcbc2a07daaa4ac6da6544560d97863.