Merge in the rocclr based hip runtime (#2032)

* Merge master-next changes in master (include vdi development in master branch)

samples/1_Utils/hipDispatchLatency/hipDispatchLatency.cpp

@@ -109,7 +109,7 @@ int main() {
     /***********************************************************************************/
 
     //Timing directly the dispatch
-#ifdef __HIP_PLATFORM_HCC__
+#if defined(__HIP_PLATFORM_HCC__) && GENERIC_GRID_LAUNCH == 1 && defined(__HCC__)
     for (auto i = 0; i < TOTAL_RUN_COUNT; ++i) {
         hipExtLaunchKernelGGL((EmptyKernel), dim3(NUM_GROUPS), dim3(GROUP_SIZE), 0, stream0, start, stop, 0);
         hipEventSynchronize(stop);