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

Change-Id: I06d27746ff0c3b406312e805df075f8373caf16e