am 803caff1: am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

* commit '803caff1dc307a8895e9f3560112f969fa3f6f39':
  Fix issue #5614559: Registering surface error in...
tree: b21a43612c5d1debb36d22ccbbd50a5093636c8a
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE