am 61ac65e2: am 1a9a0650: Merge "Adding TARGET_CPU_VARIANT to config file."

* commit '61ac65e2f55b8b4964f0e29904aed3f661daeec4':
  Adding TARGET_CPU_VARIANT to config file.