Merge branch 'memtracker' into privatestaging

Conflicts:
	include/nvcc_detail/hip_runtime_api.h

include/hip_runtime.h

@@ -43,6 +43,11 @@ THE SOFTWARE.
 #include <stdlib.h>
 #include <assert.h>
 
+#ifdef __cplusplus
+#include <thread>
+#endif
+
+
 #include <hip_common.h>
 
 #if defined(__HIP_PLATFORM_HCC__) and not defined (__HIP_PLATFORM_NVCC__)

include/nvcc_detail/hip_runtime_api.h

@@ -242,12 +242,10 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att
         cdattr = cudaDevAttrMaxRegistersPerBlock; break;
     case hipDeviceAttributeClockRate:
         cdattr = cudaDevAttrClockRate; break;
-#ifdef USE_ROCR_20
     case hipDeviceAttributeMemoryClockRate:
         cdattr = cudaDevAttrMemoryClockRate; break;
     case hipDeviceAttributeMemoryBusWidth:
         cdattr = cudaDevAttrGlobalMemoryBusWidth; break;
-#endif
     case hipDeviceAttributeMultiprocessorCount:
         cdattr = cudaDevAttrMultiProcessorCount; break;
     case hipDeviceAttributeComputeMode: