Merge "Convert cpufeatures to Soong"