InCallUI: Cleanup CAF additions

Change-Id: Ic747202eee89165c540407ad46dd1be50afff559
msim: Put files in the corret location

 * Destroy the zillion errors in Eclipse

Change-Id: I7b3926efe3b15b1637eac659c8a4f84dd75198fb
Merge remote-tracking branch 'cm/cm-11.0' into wszf