merge from gingerbread

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