Merge "feat(tools/shrinkwrap): add FVP arguments for DA testing" into integration