Merge 'master' into 'amd-master'

Change-Id: Ia5a392b6b40cffec050e740f0750734cff1318ce


[ROCm/hip commit: 9b95edf508]

projects/hip/tests/hipify-clang/lit.cfg

@@ -17,6 +17,7 @@ config.excludes = ['cmdparser.hpp']
 
 if config.cuda_version_major == 7 and config.cuda_version_minor == 0:
     config.excludes.append('headers_test_09.cu')
+    config.excludes.append('cudnn_convolution_forward.cu')
 if config.cuda_version_major < 8:
     config.excludes.append('cuSPARSE_02.cu')
 if config.cuda_version_major < 9: