Merge "Move telephony/cdma/ classes into appropriate package."