telephony: Cleanup after QCRIL merge

Change-Id: I777818d9034593696bf96ad96048daa0011e9f80