Merge "Add update_channel field to bootloader_message_ab."
am: 63eb1a4444

Change-Id: Ie12275c2694cabcf5b934f0673ecb228d6c8c3e6