Merge change 2710

* changes:
  Rename TARGET_ARCH_VERSION into TARGET_ARCH_VARIANT