fix gl functions 4 android
Merge branch 'master' into macos-build