Merge "fix(fiptool): avoid packing the zero size images in the FIP" into integration