Merge "Allow bootctrl hal to work in recovery" am: 34cf1f5673 am: b1520ef280 am: 3c065f0476
am: 77aa206ee2

Change-Id: I7c538ed2fb7c882afea8c0423108e5af57ff7f63