Adding TARGET_CPU_VARIANT to config file.

Bug: 8005082

Merge from internal master.

Change-Id: I33210d3044119fbeb1ce00a515a2f32d6893ad14
Clean up

Change-Id: Ia61f3741b9178e2e8ee5e2a792e94fea75f1da9c