Switch back to HTCQualcommRIL class