Allow DISPLAY_VARIANT to be overriden by device/family mk files

Change-Id: I1a138d12dc706ef729f4c4fdb07c9bbbd5ec31a8
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2