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

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