Merge "Fix warnings in frameworks/native/opengl/tests" into nyc-dev