Merge "recovery: Fix the argument parsing from COMMAND_FILE."
am: 332af25b7c

Change-Id: Ib7cdd050d4f20c61ac35c1fb1ad469c5b1c72262