Revert "InCallUI: Cleanup CAF additions"

This reverts commit c96f3c5d3d1d7fd93ad4ae100ac82d0d50c1852d.
Revert "msim: Put files in the corret location"

This reverts commit 8421cd36e17c7c32d79d9d159263d8bfa97217dd.