Post-merge fixes

Author: Meinersbur

flang-rt/unittests/Runtime/Pointer.cpp

@@ -7,9 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "flang/Runtime/pointer.h"
+#include "tools.h"
 #include "gtest/gtest.h"
 #include "flang-rt/runtime/descriptor.h"
-#include "flang-rt/runtime/tools.h"
 
 using namespace Fortran::runtime;