Merge pull request github#12568 from github/rc/3.9

Merge `rc/3.9` back to `main`

Author: henrymercer

javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java

@@ -53,9 +53,9 @@
 import com.semmle.ts.extractor.TypeScriptWrapperOOMError;
 import com.semmle.ts.extractor.TypeTable;
 import com.semmle.util.data.StringUtil;
-import com.semmle.util.diagnostics.DiagnosticLevel;
-import com.semmle.util.diagnostics.DiagnosticWriter;
-import com.semmle.util.diagnostics.DiagnosticLocation;
+import com.semmle.util.diagnostic.DiagnosticLevel;
+import com.semmle.util.diagnostic.DiagnosticLocation;
+import com.semmle.util.diagnostic.DiagnosticWriter;
 import com.semmle.util.exception.CatastrophicError;
 import com.semmle.util.exception.Exceptions;
 import com.semmle.util.exception.ResourceError;