Merge "Make fastboot command-line parsing a bit more like adb." am: 0a253390d1
am: f22da9a1ba

Change-Id: I64411bd986c4f729840d7099291ff08a83429320