[f21-branch] Adjust to blivet's requirement of aligned target size