keep up with cm opt/telephony and fix build