Merge from 'next' to 'master': [rilmodem] fix warnings from ril plugin

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