am c36a4b6e: am 18be7ab2: Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."

* commit 'c36a4b6ea93e5cd4743129b0534a61c6ce4a9aa2':
  Stash TARGET_CPU_VARIANT and print it in dumpvar.