Merge "libsnapshot: Fix test UpdateBootControlHal"