resolved conflicts for merge of f0b3fa60 to master

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