Revert "Merge branch 'amd-master-next' into amd-npi-next"

This reverts commit 258d79bca7.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I53322718dadde2c98f96140b8e260ec7ee9ef721


[ROCm/hip commit: 374ead1d19]

projects/hip/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp

@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr nvcc
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr
  * TEST: %t
  * HIT_END
  */