Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." am: 405f4d3552
am: ff8131a493

Change-Id: Id94bb0563331d162d5bef13c6d5465175395bdcd