Merge "Fix more warnings in framworks/native/opengl/include"
am: e714200784

Change-Id: I3d87ab34104953546061d4999bcd1f21b01ad401