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

Change-Id: I739fb29f259503f0fe39d7b0122cbbb134cfcee1