Merge "opengl: Fix include style in generated JNI code"