Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5
am: 7354c237ea

Change-Id: I43d772721d8ad9538b0ced7bb9592ad0f1dd0dd8