resolved conflicts for merge of 037b54cf to master

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