Merge "Fix a crash when parsing fastboot command-line arguments"