Merge changes Iad983802,Icda236ee

* changes:
  opengl: Fix #include style in generated JNI code
  opengl: Un-hide GLES31 and GLES31Ext classes