[automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073
am: 17f6c1b041  -s ours

Change-Id: I86f2a84affaf0d03be0431d35d265767b1ba68c1