Revert "remove display-caf and media-caf"

This reverts commit 5bee6484fbd1a719cb1328c0ac38dc3fca1ca778.