Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
tree: b7af549de036a18dfd20882c6564b752daf1288b
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE