Merge "s4-common: move ril class and flag to devices." into cm-10.1