Merge "Fix logspam when user removed before CE storage prepared"
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 94d7f15..6ad3c6f 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -114,6 +114,9 @@
 static bool rmrf_contents(const std::string& path) {
     auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir(path.c_str()), closedir);
     if (!dirp) {
+        if (errno == ENOENT) {
+            return true;
+        }
         PLOG(ERROR) << "Unable to open directory: " << path;
         return false;
     }