Merge 'master' into 'amd-master'

Change-Id: I1ff5e75252891feb8a2657a5913ed7cfaf544d98

hipify-clang/src/main.cpp

@@ -36,6 +36,7 @@ THE SOFTWARE.
 #include "LLVMCompat.h"
 #include "HipifyAction.h"
 #include "ArgParse.h"
+#include "llvm/Support/Debug.h"
 
 #define DEBUG_TYPE "cuda2hip"