Merge "fastboot: Fix snapshot-update merge behavior." into rvc-dev am: 4adbeb470f

Change-Id: I56da350eec80f0232d24c2f6d160b97b2e3c4087