Merge "Make fastboot command-line parsing a bit more like adb."