am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1

* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580
tree: 6df7ff7d76e3906f6b1a7a2a66f645bdf7faf9f0
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE