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

Change-Id: I988e33ae56083ff4717155c335b27bb6f2f18088