Correct merge error.

Old memory properties info name used after removing branches.
This caused the CPU coarse grain pool to initialize with random
bits.

Change-Id: I397bc5ecf09fab69bdf1d7fafadcf54d71b64070

runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp

@@ -92,7 +92,7 @@ void CpuAgent::InitRegionList() {
 
     if (!is_apu_node) {
       MemoryRegion* system_region_coarse =
-          new MemoryRegion(false, false, is_apu_node, this, *system_prop);
+          new MemoryRegion(false, false, is_apu_node, this, system_props);
       regions_.push_back(system_region_coarse);
     }
   }