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

Change-Id: Id9a4a0f1b09a06dfa23f761e1602320b97546f8b