Fix OpenGL bug on Android 4.1.x
Merge remote-tracking branch 'antox/master'