am dc05ca5b: Merge changes I12644a0e,Idbe25881

* commit 'dc05ca5be2319f74b41cb429ea50f30fceff4ace':
  Remove obsolete sincos from stlport
  Fix sincosf -> sincosf recursion