Merge "feat(fiptool): handle FIP in a disk partition" into integration