Reconcile with gingerbread-release

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