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

* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
  Fix GLES30 JNI registration