[PATCH 1/3] configs: j721s2: Merge the HS and non-HS defconfigs