Merge 6b739dc7 from gingerbread

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