Revert "switch to TARGET_QCOM_VARIANT"

This reverts commit 78497635931d303ad709bcfb142eb306648b63f9.