m7spr: Switch back to HTCQualcommRIL class

Until M7CDMA class is merged

Change-Id: I6e7cd0d811f9bf2a6469954c5c9437272c823b44
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0