Merge from gingerbread-plus-aosp

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