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

Change-Id: I028c7712fd243d7d291add1b2864a198959a1d34