Merge "vold: implement resetCheckpoint"