Upstream sync (1/2)

Should ideally allow us to properly depend on CM's display-caf-new

Change-Id: I7483040b718e16c09eb4828db79bb322eec5a67d
Merge "Upstream sync (1/2)" into kitkat