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

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