am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.

* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
  CherryPick f9e455 from master to mr0. do not merge.
tree: 28eee3f42811afd37db117e8ea5ec72270f61958
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE