Android CTS 5.1 release 4
am bf0b5c8b: am dc05ca5b: Merge changes I12644a0e,Idbe25881

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