am 7e4aa24c: Reconcile with ics-mr1-release

* commit '7e4aa24c8701381f542a324df958907194285fdc':
tree: b2ba4545d3d06a8ccde00a2f5051189f4b3449ae
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE