Adding TARGET_CPU_VARIANT to config file.

Merge from internal master.

Change-Id: Id485e35d6b0288a95e9cdf7314b0d026d66253f9
1 file changed