Move sic_team consolidation from oi-build to oi-userland