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

Change-Id: I232c7f4a0e448d46afd9c2f13fafa07a3b6727d0