[ril] fix merge and some style issues

Signed-off-by: Jarko Poutiainen <Jarko.Poutiainen@oss.tieto.com>