Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa
am: e9788bc361

Change-Id: I4873bf08c5406a0e2270e2ee267a962b4f3164bf