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

Change-Id: I71092487c95b5390b612ab19b153e9eb46d50507