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

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