Automerge: [Support] Restore a couple of includes

A build failure has been reported at:

llvm/llvm-project#142733 (comment)

Author: kazutakahirata

llvm/lib/Support/Z3Solver.cpp

@@ -6,7 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/ADT/ScopeExit.h"
 #include "llvm/Config/config.h"
+#include "llvm/Support/NativeFormatting.h"
 #include "llvm/Support/SMTAPI.h"
 
 using namespace llvm;