Merge "regenerate GLES java bindings" into jb-mr2-dev