Adding TARGET_CPU_VARIANT to config file.

Bug: 8005082

Merge from internal master.

Change-Id: I50f0d33addb858b0c0510f97b4a1abb8bd9a4691