Revert "display-caf"

This reverts commit 05466fc02c7599ecd4c4de56ed2696ab090265ca.

Change-Id: Ic305214dd7ffa9f1a8b3dd40c22d3e0cc412a577
Merge "Revert "display-caf"" into android-4.4