Merge "Fix more warnings in framworks/native/opengl/include" am: e714200784 am: caf04ed42f am: 7e7f3d4672
am: 3424c8d1ee

Change-Id: I650265920a5459fd63b124b60957c3a6e89cdd6e