am 8d618890: am 01d98425: Merge changes Ib5e6736f,Ibf1b146d

* commit '8d61889074faf8430b37877235bac658d68e34c3':
  stlport: c_locale_dummy unused argument warnings
  stlport: deal with compile warnings