qcom and ril from omni

Change-Id: I860d5c682d013385b0c960ccbef46c4a3b74b5c6