make TARGET_QCOM_DISPLAY_VARIANT more parametric

Change-Id: I36bba3ba96e174b443d800fd79957a1f428899df
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_native into DJL10.2