CAF cleaning

Get ready for https://github.com/kecinzer/kernel_msm/tree/android-msm-flo-3.4-jb-mr2

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