resolved conflicts for merge of 42dd7ec9 to master

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