Merge "Remove /proc/cpuinfo parsing"