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

Change-Id: Ic66b6370515a7aed2f26bdacf64859668d230e37