dumpvar: print both ARCH_VARIANT_CPU and CPU_VARIANT

Change-Id: I506b9fac5b5bd9c5334066f055cff33131d0022c