CAF cleaning

Prepare for https://github.com/kecinzer/kernel_msm/tree/android-msm-mako-3.4-jb-mr2

Change-Id: Ib1ce4ca61fab670957810fc71ea0b52d4c918aee
Signed-off-by: kecinzer <kecinzer@gmail.com>