Revert "change kernelbranch"

This reverts commit 8a8226d0026ec5e21c5310217eef2e47ce8014b6.
Revert "build error"

This reverts commit 3cab634bf2f7b2e71d284358d8ba4648e95c7572.
Revert "use cm display-caf"

This reverts commit 4f289ceae79b78c29b7c1fdcd52936354d30bc08.
kernel branch