Merge "Writes cpu variant information to dev/"