Merge branch 'release_0.84.00' into privatestaging

Conflicts:
	include/hcc_detail/hip_runtime.h
	src/hip_hcc.cpp


[ROCm/clr commit: 02e6fc27f4]

projects/clr/hipamd/include/hip_runtime_api.h

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 
 #include <string.h> // for getDeviceProp
-#include <hip_common.h>
+#include <hip/hip_common.h>
 
 typedef struct {
     // 32-bit Atomics
@@ -202,9 +202,9 @@ typedef enum hipDeviceAttribute_t {
  */
 
 #if defined(__HIP_PLATFORM_HCC__) && !defined (__HIP_PLATFORM_NVCC__)
-#include "hcc_detail/hip_runtime_api.h"
+#include "hip/hcc_detail/hip_runtime_api.h"
 #elif defined(__HIP_PLATFORM_NVCC__) && !defined (__HIP_PLATFORM_HCC__)
-#include "nvcc_detail/hip_runtime_api.h"
+#include "hip/nvcc_detail/hip_runtime_api.h"
 #else
 #error("Must define exactly one of __HIP_PLATFORM_HCC__ or __HIP_PLATFORM_NVCC__");
 #endif