Minor fixes to make the boot_control HAL work on real hardware. am: 1eb74c93ed am: 90bd1317e8
am: fa1a11c87c

Change-Id: I2d0aca185cfa47c653b01fb4ad2d07d3470a3045