[PATCH v2 4/6] configs: j721e: Merge the HS and non-HS defconfigs