Merge "libsnapshot: Fix test UpdateBootControlHal" am: 834e4751e6
am: c3e0ca1911

Change-Id: I80388179c5a0e06b3f7e4a7700a83ea0bd327914