[automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 am: 17f6c1b041 -s ours
am: 9fa43507ef -s ours
Change-Id: I2c4296f41a5fa7f8f2ca8cc44134075aae3f5ff1
This commit is contained in: