Merge pull request #7311 from andyque/fixWindowsError

fix windows compile and running error
should not include android cpp files in win/wp project
Merge pull request #7314 from joshuastray/fix_win_proj

should not include android cpp files in win/wp project