am 5786f5cf: Merge "Fix build." into ics-mr1

* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
tree: 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE