m4: Don't override RIL class

Change-Id: I73a9233fad88805654ce279fef453b8f26e9d69e
Merge remote-tracking branch 'cm/cm-11.0' into HEAD