Reconcile with ics-factoryrom-2-release

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