Do not use blocks when creating otapackage
otatools: re-add -r option to remove recovery from ota package