Reconcile with ics-mr1-release

Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
tree: fc667b677171193a720d937c573bb4bc62c24845
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE