Merge changes Ib5e6736f,Ibf1b146d

* changes:
  stlport: c_locale_dummy unused argument warnings
  stlport: deal with compile warnings