Drop display-caf and media-caf forks now that patches were submitted

Change-Id: Ie713e2b42a1c72134172e9bcebe7baf43d20b00d