Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
make TARGET_QCOM_DISPLAY_VARIANT more parametric

Change-Id: I36bba3ba96e174b443d800fd79957a1f428899df
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_native into jb43
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'scotthartbti/jb43' into beanstalk-jb43
Merge remote-tracking branch 'opensemc/cm-10.2' into beanstalk-jb43

Conflicts:
	include/gui/SurfaceComposerClient.h
	libs/gui/SurfaceComposerClient.cpp