configs: j721s2: merge HS and non-HS defconfigs