am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"

* commit '66e952e254c9bda46d5ef9614027b18d0a7a6c8e':
  fastboot: support for overriding format fs-type and size