Merge "Improve error messaging when bootcontrol HAL fails to load." am: 4878f6a31c
am: 1074b8a539

Change-Id: I6438198585e750b796d4cbc5c0e05940cbd90e40