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

Change-Id: I0be84193224de80faf8ca32b62bb75180fa03d1f