am c521b108: Merge "Fix a GL error leak issue"

* commit 'c521b10854ebdc227d6f32649c627a548caef2e4':
  Fix a GL error leak issue