Merge "Use libbootloader_message." am: 1dfd1df2e3 am: df161ae45b
am: 2af30c5439

Change-Id: I18521613a44c07f4c1b39d41e1b8172207157982