Merge "Seperate RIL constants from the framework."