fix compile error on android.
Merge pull request #7940 from andyque/fixVs2013CompileError

Fix vs2013 compile error
Merge pull request #7943 from Dhilan007/v3

fix compile error on android.