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

Change-Id: I93a3e5a36b5980f004b18257fcd74b16a13fe735