Switch to new system_vold