Merge pull request #3094 from koying/fixstagefright