Merge "fastboot: Flashall does proper snapshot cancel"