topology2: fix includes for dmic-wov-feature and sof-hda-generic

- dmic-wov-feature: include dai-kpb-be.conf, host-gateway-capture.conf,
  wov-detect.conf, and wov.conf required for legacy single-detector WoV
- sof-hda-generic: conditionally include mfcc.conf only when INCLUDE_WOV
  is 'multi' to avoid duplicate class definition conflicts when dmic1-mfcc
  already includes it.

Author: lrgirdwo

tools/topology/topology2/dmic-wov-feature.conf

@@ -16,6 +16,10 @@
 <input_pin_binding.conf>
 <output_pin_binding.conf>
 <dmic-default.conf>
+<dai-kpb-be.conf>
+<host-gateway-capture.conf>
+<wov-detect.conf>
+<wov.conf>
 <dmic.conf>
 <pdm_config.conf>
 <hw_config_simple.conf>

tools/topology/topology2/sof-hda-generic.conf

@@ -54,7 +54,6 @@
 <kpb.conf>
 <wov.conf>
 <wov-arbiter.conf>
-<mfcc.conf>
 <mww.conf>
 <ecns.conf>
 <bytes.conf>
@@ -90,6 +89,11 @@ IncludeByKey.HDA_CONFIG {
 	"passthrough"	"cavs-passthrough-hda.conf"
 }
 
+# dmic1-mfcc.conf includes the mfcc class itself, a second include breaks it
+IncludeByKey.INCLUDE_WOV {
+	"multi"	"include/components/mfcc.conf"
+}
+
 # include DMIC config if needed.
 IncludeByKey.NUM_DMICS {
 	"[1-4]"	"platform/intel/dmic-generic.conf"