Adding TARGET_CPU_VARIANT to config file.

Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.

Merge from internal master.

Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7