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

Change-Id: I6cd126125c31b2fd5ef61512b104db75a91c422d