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

Change-Id: Ibcbcef4f29b1dca2b3209028281d5897dc999925