Reconcile with ics-factoryrom-2-release

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