[PATCH v5 2/4] configs: j721e: Merge the HS and non-HS defconfigs