Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 am: e182b26d64
am: 3631ac59fd

Change-Id: I0514429a69a6a7331651d05cb530029d43e9c895