fix compiling erros on Android
Merge pull request #4125 from minggo/fix-compiling-error

[ci skip]fix compiling erros on Android
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch