Reconcile with ics-mr1-release

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