Compilation fixes for Telephony.

Change-Id: I1e2e2caf3096c81f1fe783fcec6d4a61a0888e2c
24 files changed