Use caf variant for display and media
Use headers from kernel tree
Revert "Use caf variant for display and media"

This reverts commit ac60e8f08d7f8c844797841e3f557ae42b609771.