am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.

* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
  CherryPick 35530d 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