Use actual kernel headers and display-caf paths if defined

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