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

Change-Id: If5764dd98d9b45186628f32e7e3a7b470118af23