am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab

* commit '2d2fd4cdeac031e78a63c40d01a96a93ebb3eed8':
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries
  fastboot: allow format on devices with small buffers