Merge changes from topic "frameworks/opengl/sync-gen"

* changes:
  glgen: sync generator with manual changes
  Sync generator script with manual Java changes