am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread

* commit '83fdc69ea0beb715dd45f0a4285cb5d780f8018a':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.
tree: 6a90d2de1dbfdd2e78815cffa70373fa433f56c1
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE