Merge "fastboot: Flashall does proper snapshot cancel" am: 48d3b1e112 am: cb6c6ef123 am: db47d2d068

Change-Id: Iefc7a7e2c0e0789dcd83d9e81cee2fa531d2302b