Allow DISPLAY_VARIANT to be overriden by device/family mk files

Change-Id: I1a138d12dc706ef729f4c4fdb07c9bbbd5ec31a8
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_device_motorola_qcom-common into jb43