Merge 'develop' into 'amd-staging'

Change-Id: If9e6261edcebf12721b96d7097336b40548d34cd

.jenkins/jenkinsfile

@@ -64,10 +64,10 @@ def hipBuildTest(String backendLabel) {
                     echo "testing $HIP_PATH"
                     # Check if backend label contains string "amd" or backend host is a server with amd gpu
                     if [[ $backendLabel =~ amd ]]; then
-                        cmake -DHIP_PLATFORM=amd ../catch 
+                        cmake -DHIP_PLATFORM=amd -DHIP_PATH=\$CLR_DIR/build/install ../catch 
                     else
                         export HIP_PLATFORM=nvidia
-                        cmake -DHIP_PLATFORM=nvidia ../catch
+                        cmake -DHIP_PLATFORM=nvidia -DHIP_PATH=\$CLR_DIR/build/install ../catch
                     fi
                     make -j\$(nproc) build_tests
                     """