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

Change-Id: Ie20ade4b017f11e807453572151a42408614703f