Merge "feat(qemu): combine TF-A artefacts into ROM file" into integration