Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev