am 6504d74b: am 72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1

* commit '6504d74b8f7b98f7c2d5fb550042c644510d5f34':
  [maguro] Fix STK issues
tree: 96fbf0c5fc27625175ddee51b82ff9b5b8934fa8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE