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

Change-Id: I0efbcbb2542676e9310752d10c208704c46ca22d