Reoncile vidc with cm-11.0

Change-Id: I8ab1a3a3fb7df4560ee65024e21e4c9263e1a89e
Fix path for including non caf display variant files

Change-Id: Iba960c34c185593bd0afb952a05f603aa5bf0db6