[PATCH v1 3/3] configs: j721e: Merge the HS and non-HS defconfigs