Revert "Track own display-caf"

This reverts commit 16daeb8d361abe67e6408b109cdfeadd75121eaf.

Change-Id: Iff2a0df4103e6c1b4b5c4fd597e0845187734303
Revert "Track own audio-caf / media-caf"

This reverts commit bbb8dbd38cd3d5235dd1933237201c0cf18ef697.

Change-Id: I108e41e562ddc3f811c22915b3caba445f3a115f