am 1517f157: Merge commit \'7813481e\' into manualmerge

* commit '1517f1578ac6e0e4e7a52a766074d203f7ecebdc':
  Fix fastboot --help formatting.