Revert "Merge branch 'cm' into HEAD" <-- BROKE BUILD See:
https://github.com/VanirAOSP/frameworks_opt_telephony/commit/bec95e65ec381c1bd638ef7c3a3c64a6ce288a18#commitcomment-6595798

This reverts commit bec95e65ec381c1bd638ef7c3a3c64a6ce288a18, reversing
changes made to 00aeacf574ea11e84928e67778023d1772348bda.

Change-Id: I78bbe123e1f7a32fb76b0061ebe6932875966b0a