Merge "Let vold_prepare_subdirs completely clean deleted user data." into pi-dev