Merge from gingerbread

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