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

Change-Id: Icde802ad7a85437311b54f973d4e7066e7a4f96e