InCallUI: Cleanup CAF additions

Change-Id: Ic747202eee89165c540407ad46dd1be50afff559
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_InCallUI into kitkat
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_packages_apps_InCallUI into kk4.4