Merge "Adding TARGET_CPU_VARIANT to config file."