resolved conflicts for merge of 6421ae7e to master

Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
tree: 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE