am 01d98425: Merge changes Ib5e6736f,Ibf1b146d

* commit '01d98425a4d9b02e306a14a746541990df3d5743':
  stlport: c_locale_dummy unused argument warnings
  stlport: deal with compile warnings