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

Change-Id: I1afc56e502dc3db32f68e568d5493303902079a5