Merge "Fix more warnings in framworks/native/opengl/include" am: e7142007 am: caf04ed4 am: 7e7f3d46 am: 3424c8d1 Change-Id: I650265920a5459fd63b124b60957c3a6e89cdd6e