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

This reverts commit 9142674ef0.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

hipamd/tests/src/runtimeApi/stream/hipStreamACb_MultiCalls.cpp

@@ -21,7 +21,7 @@
 // when hipStreamAddCallback() is called back to back multiple calls
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11
+ * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */