Merge "Fix cpufeatures to not parse /proc/self/auxv"