Merge de8635e4 from gingerbread-plus-aosp

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