Move display variant to family

Change-Id: Id7eff6061ede56054e56dc040d09c39e70d0b9aa
Merge branch 'cm-11.0' of github.com:CyanogenMod/android_device_motorola_msm8960-common into cm-11.0