Merge "meson_to_hermetic: Fix cpu/cpu family not syncing on project configs" into main