Merge f126ad3b from gingerbread

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