Merge from open-source froyo

Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76
tree: 1b418689ab5240c1fa4df58e97df2821e4b03966
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE