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