Merge "fastboot: Fix snapshot-update merge behavior." am: 67da0932d8

Change-Id: I570722cf7701b1c1fd7798d4067ffe3e2d960c62