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

Change-Id: I0eb3026ec113f196c80dc070b1e704f8038ffe10