Revert "Switch back to HTCQualcommRIL class"

This reverts commit 0da7b4fa60dc263fb4efc5d2a4e3d1dbe05aa5dd.