am b95a4ed6: am 161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."

* commit 'b95a4ed64aff542d04b667ff5f239d152735808a':
  Adding TARGET_CPU_VARIANT to config file.