Merge "Fix a crash when parsing fastboot command-line arguments" am: 517f6d476e
am: 1c1ee87e35

Change-Id: I5020f555a4181b78ee7ff744f05cf09268f33b8d