Move display variant to family trees

Change-Id: Iebf73370397bb0216ce7d32cc06473c30ad37199
Move QCOM_BSP up to family

Change-Id: I5d25c59db4bd4a785379abbfc218e97eb4d7b683
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0