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

Change-Id: Icba7af54e27dd7fe34d3971616e298b441c059cc