am b077630d: (-s ours) am 45ab4d5b: am 259f27b2: Merge "Fix GetCpuInfo() routine to correctly check the cpuinfo file to make sure we don\'t miss SIMD path if there is one."

* commit 'b077630d83769df6ce80480b1d66f2e21bd57642':