Merge "fastboot: Fix snapshot-update merge behavior."