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

Change-Id: Ifbbccbd890d3ab80910586c52f263e903e36dbbd