Merge "Writes cpu variant information to dev/"
am: cfd0b6c19d

Change-Id: I8ad9d2f8cb68b7ff3850d9404fddf344a581a596