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

Change-Id: I05a7fb63ec6bde01292b8cb708b1f3fff33fe87f