Merge from gingerbread

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