gs-flatpak: Use gs_appstream_add_data_merge_fixup()

This will merge information from the .desktop files and system merge components
into the corresponding appstream data.

Closes #1649
3 jobs for 1649-support-appstream-merging in 4 minutes and 5 seconds (queued for 1 second)
latest