Substitute all generic types into function trap IDs and signatures, and ensure the subbed types are never primitive

The solution for ensuring they are primitive (making the range of the substitution always nullable) will need replacing once we export Kotlin types.

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -203,7 +203,7 @@ open class KotlinFileExtractor(
             when (argsIncludingOuterClasses) {
                 null -> { x: IrType, _: TypeContext, _: IrPluginContext -> x.toRawType() }
                 else -> {
-                    getTypeParametersInScope(c).map({ it.symbol }).zip(argsIncludingOuterClasses).toMap().let {
+                    makeTypeGenericSubstitutionMap(c, argsIncludingOuterClasses).let {
                         { x: IrType, useContext: TypeContext, pluginContext: IrPluginContext ->
                             x.substituteTypeAndArguments(
                                 it,