resolved conflicts for merge of f61c3d07 to master

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