Merge changes I12644a0e,Idbe25881

* changes:
  Remove obsolete sincos from stlport
  Fix sincosf -> sincosf recursion