Merge pull request #4678 from koying/fixdroidrtmp