am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"

* commit '0f85f2de9c2ba9d764c7774fb826535ed9d148ca':
  Fix return type of glGetAttribLocation and glGetUniformLocation