Merge from master

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