htc s4: use htc ril class

Change-Id: I77f92d8548e5439bd722661e6fc99ffe9a60a9c7
Merge remote-tracking branch 'upstream/cm-10.1' into testing