resolved conflicts for merge of ec52c98d to master

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