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

Change-Id: I8fa5c4101b1569bc828218b476163f36c9df6e0b