system/vold: legacy branch