Merge "bootloader_message: Remove global std::string" am: 7b87949ae1
am: 76d80ba102

Change-Id: I5d8cdd458d17129656424e8e09ca52578a5f6c53