Stash TARGET_CPU_VARIANT and print it in dumpvar.

Bug:7961327

Merged from internal master.

Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
2 files changed