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

Change-Id: Iddeb8e2722162edcd5929a9e9684d3c7fcfcd0ba