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