Merge "Fix GetCpuInfo() routine to correctly check the cpuinfo file to make sure we don't miss SIMD path if there is one."