Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aosp
am: 726c9271db

Change-Id: I8500833326fb5f4b64e8d9df721ff4335b407b09