Store our best guess at TARGET_ARCH_VARIANT_CPU if it is not defined

Change-Id: I850ea59be32cf725b9ca8adb3693f30a42e31d54