Merge "bootloader_message: Add a magic header to the Virtual A/B message block." am: f78b7a7b94
am: da8658b78b

Change-Id: I18f6a1a71df38fc6ae6347830a27d6f5dddc3287