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

Change-Id: I4b3b0a0cab4dc51a673fe2da4d72f26c74c5fb23