am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev

* commit '09f3cc2bcca62fea30dc0f22cc120088e9f54728':
  Fix GLES30 JNI registration