Merge "frameworks/native/opengl: Fix build with gcc 4.8"