Update flags for CAF display & media variants

Change-Id: I67eeb9254baab683dca0c83eaf783faf7d643e8b
credit: sultanxda
Merge remote-tracking branch 'ls/msm_fb'; commit 'HEAD' into HEAD