Merge branches 'vala-fix-pr11222' and 'vala-fix-pr11229' into maint * vala-fix-pr11222: vala: fix vapi files handling vala: test vapi files handling (still failing) * vala-fix-pr11229: vala: fix distcheck with c/vala mixed projects