Merge branch 'amd-dev' into change-896675-1

Change-Id: I950d40ff0789f62595561196aea48203b00d165b


[ROCm/amdsmi commit: c139bd8dc0]

projects/amdsmi/src/amd_smi/amd_smi_utils.cc

@@ -49,12 +49,8 @@ static const uint32_t kAmdGpuId = 0x1002;
 
 static bool isAMDGPU(std::string dev_path) {
   std::string vend_path = dev_path + "/device/vendor";
-  std::string vbios_v_path = dev_path + "/device/vbios_version";
-  if (!amd::smi::FileExists(vend_path.c_str())) {
-	return false;
-  }
 
-  if (!amd::smi::FileExists(vbios_v_path.c_str())) {
+  if (!amd::smi::FileExists(vend_path.c_str())) {
 	return false;
   }