Revert "Telephony: Squashed commits needed to use CM fw/opt/telephony"

This reverts commit 766322cf180871ecb93edf58b930cf383643120a.