Merge "vold_prepare_subdirs: prepare /data/misc_[ce|de]/rollback."
am: 3cc1866454

Change-Id: I1fe5887b2d4a0c222e95e594562f368587e069c5