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

* commit 'e67bb3dc07975413341087727dd797b69fdd5dd2':
  Fix return type of glGetAttribLocation and glGetUniformLocation