Merge from gingerbread-plus-aosp

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