Correct merge conflict where armv7 boot_cmd.c hack was lost