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

Change-Id: Ic3be7b7350d95005f40525b3759d30b1e9b3a744