Revert "Deal with CM changing vars (WITH_QC_PERF) for no reason, and still be able to"

This reverts commit ecec401e2886eb8504a97fc0726c7f8e7c159fe1.
Show TARGET_RECOVERY_VARIANT during dumpvar.mk
Actual var is RECOVERY_VARIANT however using it makes things very messy!
Change-Id: I0b4058dc7441abcf6ef820cc916d1a6805644bd8
[WIP]: New changes needed for msm-3.5 clang

Change-Id: If41682c7265645056be757e58eb14b8707ce7438