Merge "Fix GLES30 JNI registration" into jb-mr2-dev