Merge ba3dd323 from gingerbread

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