am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"

* commit '5e530e02bc3073a2e2469df3c333ae14f1b37433':
  Fix return type of glGetAttribLocation and glGetUniformLocation