back to CM's telephony & ril
Merge upstream