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

Change-Id: Iaeec97819fc05674b31decc613cb9262f0eb4556