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

This reverts commit 374ead1d19.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

tests/src/runtimeApi/device/hipSetGetDevice.cpp

@@ -25,7 +25,7 @@
  */
 
 /* 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_NAMED: %t hipSetGetDevice-invalidDevice
  * TEST_NAMED: %t hipSetGetDevice-allValidDevice
  * TEST_NAMED: %t hipSetGetDevice-validDev1 --computeDevCnt 1