Merge "vold now deletes misc_ce/misc_de"