Merge "add TARGET_CPU_VARIANT to PDK ARM target"