Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"