Merge "vold_prepare_subdirs needs to recursively delete"