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

Change-Id: I3000b9adae1bc43f1ccdd36d313556dd93be2a33