Fixed android and windows x64 build issues
Merge pull request #2889 from Ilya-Krylov:fisheye