Merge "i605: fix ril" into cm-10.2