Use proper TARGET_CPU_VARIANT
Merge commit '3dc1c31' into jb-4.3