Swap provisional files in telephony from AOSP to CM

Sometime a more rigourous approach to what provisionals go where might be in
order.

closes #198