Remove custom RIL, merge changes to main libril