Merge "Fix more warnings in framworks/native/opengl/include"