Remove the dependency on bootloader_message am: 19e876f0b5

Change-Id: I8c4c687baa75ab3c0eb5d6bb863a632f9bd99596